[S390] uaccess: make sure copy_from_user_overflow is builtin

heicarst · Martin Schwidefsky · commit 596a95cdf0ba · 2010-03-08T12:25:29.000+01:00
If there is no in kernel image caller modules will suffer:

ERROR: "copy_from_user_overflow" [net/core/pktgen.ko] undefined!
ERROR: "copy_from_user_overflow" [net/can/can-raw.ko] undefined!
ERROR: "copy_from_user_overflow" [fs/cifs/cifs.ko] undefined!

Signed-off-by: Heiko Carstens &lt;heiko.carstens@de.ibm.com&gt;
Signed-off-by: Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;
diff --git a/arch/s390/lib/Makefile b/arch/s390/lib/Makefile
@@ -2,7 +2,8 @@
 # Makefile for s390-specific library files..
 #
 
-lib-y += delay.o string.o uaccess_std.o uaccess_pt.o usercopy.o
+lib-y += delay.o string.o uaccess_std.o uaccess_pt.o
+obj-y += usercopy.o
 obj-$(CONFIG_32BIT) += div64.o qrnnd.o ucmpdi2.o
 lib-$(CONFIG_64BIT) += uaccess_mvcos.o
 lib-$(CONFIG_SMP) += spinlock.o

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,8 @@`
`2`	`2`	`# Makefile for s390-specific library files..`
`3`	`3`	`#`
`4`	`4`
`5`		`-lib-y += delay.o string.o uaccess_std.o uaccess_pt.o usercopy.o`
	`5`	`+lib-y += delay.o string.o uaccess_std.o uaccess_pt.o`
	`6`	`+obj-y += usercopy.o`
`6`	`7`	`obj-$(CONFIG_32BIT) += div64.o qrnnd.o ucmpdi2.o`
`7`	`8`	`lib-$(CONFIG_64BIT) += uaccess_mvcos.o`
`8`	`9`	`lib-$(CONFIG_SMP) += spinlock.o`