x86: merge putuser asm functions.

putuser_32.S and putuser_64.S are merged into putuser.S.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/lib/Makefile

@@ -5,7 +5,7 @@
 obj-$(CONFIG_SMP) := msr-on-cpu.o
 
 lib-y := delay.o
-lib-y += usercopy_$(BITS).o getuser.o putuser_$(BITS).o
+lib-y += usercopy_$(BITS).o getuser.o putuser.o
 lib-y += memcpy_$(BITS).o
 
 ifeq ($(CONFIG_X86_32),y)

arch/x86/lib/putuser_32.S → arch/x86/lib/putuser.S

@@ -2,6 +2,8 @@
  * __put_user functions.
  *
  * (C) Copyright 2005 Linus Torvalds
+ * (C) Copyright 2005 Andi Kleen
+ * (C) Copyright 2008 Glauber Costa
  *
  * These functions have a non-standard call interface
  * to make them more efficient, especially as they
@@ -11,6 +13,7 @@
 #include <linux/linkage.h>
 #include <asm/dwarf2.h>
 #include <asm/thread_info.h>
+#include <asm/errno.h>
 #include <asm/asm.h>
 
 
@@ -69,15 +72,17 @@ ENTRY(__put_user_8)
 	sub $7,%_ASM_BX
 	cmp %_ASM_BX,%_ASM_CX
 	jae bad_put_user
-4:	movl %_ASM_AX,(%_ASM_CX)
+4:	mov %_ASM_AX,(%_ASM_CX)
+#ifdef CONFIG_X86_32
 5:	movl %edx,4(%_ASM_CX)
+#endif
 	xor %eax,%eax
 	EXIT
 ENDPROC(__put_user_8)
 
 bad_put_user:
 	CFI_STARTPROC
-	movl $-14,%eax
+	movl $-EFAULT,%eax
 	EXIT
 END(bad_put_user)
 
@@ -86,5 +91,7 @@ END(bad_put_user)
 	_ASM_PTR 2b,bad_put_user
 	_ASM_PTR 3b,bad_put_user
 	_ASM_PTR 4b,bad_put_user
+#ifdef CONFIG_X86_32
 	_ASM_PTR 5b,bad_put_user
+#endif
 .previous