x86: merge getuser asm functions.

getuser_32.S and getuser_64.S are merged into getuser.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>

1 files changed, 0 insertions, 79 deletions

diff --git a/arch/x86/lib/getuser_32.S b/arch/x86/lib/getuser_32.S
deleted file mode 100644
index 2bb0a183e066..000000000000
--- a/arch/x86/lib/getuser_32.S
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * __get_user functions.
- *
- * (C) Copyright 1998 Linus Torvalds
- *
- * These functions have a non-standard call interface
- * to make them more efficient, especially as they
- * return an error value in addition to the "real"
- * return value.
- */
-#include <linux/linkage.h>
-#include <asm/dwarf2.h>
-#include <asm/thread_info.h>
-#include <asm/asm.h>
-
-
-/*
- * __get_user_X
- *
- * Inputs:      %eax contains the address
- *
- * Outputs:     %eax is error code (0 or -EFAULT)
- *              %edx contains zero-extended value
- *
- * These functions should not modify any other registers,
- * as they get called from within inline assembly.
- */
-
-.text
-ENTRY(__get_user_1)
-        CFI_STARTPROC
-        GET_THREAD_INFO(%_ASM_DX)
-        cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
-        jae bad_get_user
-1:      movzb (%_ASM_AX),%edx
-        xor %eax,%eax
-        ret
-        CFI_ENDPROC
-ENDPROC(__get_user_1)
-
-ENTRY(__get_user_2)
-        CFI_STARTPROC
-        add $1,%_ASM_AX
-        jc bad_get_user
-        GET_THREAD_INFO(%_ASM_DX)
-        cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
-        jae bad_get_user
-2:      movzwl -1(%_ASM_AX),%edx
-        xor %eax,%eax
-        ret
-        CFI_ENDPROC
-ENDPROC(__get_user_2)
-
-ENTRY(__get_user_4)
-        CFI_STARTPROC
-        add $3,%_ASM_AX
-        jc bad_get_user
-        GET_THREAD_INFO(%_ASM_DX)
-        cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
-        jae bad_get_user
-3:      mov -3(%_ASM_AX),%edx
-        xor %eax,%eax
-        ret
-        CFI_ENDPROC
-ENDPROC(__get_user_4)
-
-bad_get_user:
-        CFI_STARTPROC
-        xor %edx,%edx
-        mov $-14,%_ASM_AX
-        ret
-        CFI_ENDPROC
-END(bad_get_user)
-
-.section __ex_table,"a"
-        _ASM_PTR 1b,bad_get_user
-        _ASM_PTR 2b,bad_get_user
-        _ASM_PTR 3b,bad_get_user
-.previous