These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / x86 / lib / getuser.S

diff --git a/kernel/arch/x86/lib/getuser.S b/kernel/arch/x86/lib/getuser.S
index a451235..46668cd 100644 (file)
--- a/kernel/arch/x86/lib/getuser.S
+++ b/kernel/arch/x86/lib/getuser.S
@@ -26,7 +26,6 @@
  */
 
 #include <linux/linkage.h>
-#include <asm/dwarf2.h>
 #include <asm/page_types.h>
 #include <asm/errno.h>
 #include <asm/asm-offsets.h>
@@ -36,7 +35,6 @@
 
        .text
 ENTRY(__get_user_1)
-       CFI_STARTPROC
        GET_THREAD_INFO(%_ASM_DX)
        cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
        jae bad_get_user
@@ -45,11 +43,9 @@ ENTRY(__get_user_1)
        xor %eax,%eax
        ASM_CLAC
        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)
@@ -60,11 +56,9 @@ ENTRY(__get_user_2)
        xor %eax,%eax
        ASM_CLAC
        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)
@@ -75,11 +69,9 @@ ENTRY(__get_user_4)
        xor %eax,%eax
        ASM_CLAC
        ret
-       CFI_ENDPROC
 ENDPROC(__get_user_4)
 
 ENTRY(__get_user_8)
-       CFI_STARTPROC
 #ifdef CONFIG_X86_64
        add $7,%_ASM_AX
        jc bad_get_user
@@ -104,28 +96,23 @@ ENTRY(__get_user_8)
        ASM_CLAC
        ret
 #endif
-       CFI_ENDPROC
 ENDPROC(__get_user_8)
 
 
 bad_get_user:
-       CFI_STARTPROC
        xor %edx,%edx
        mov $(-EFAULT),%_ASM_AX
        ASM_CLAC
        ret
-       CFI_ENDPROC
 END(bad_get_user)
 
 #ifdef CONFIG_X86_32
 bad_get_user_8:
-       CFI_STARTPROC
        xor %edx,%edx
        xor %ecx,%ecx
        mov $(-EFAULT),%_ASM_AX
        ASM_CLAC
        ret
-       CFI_ENDPROC
 END(bad_get_user_8)
 #endif