x86/asm/entry, x86/vdso: Move the vDSO code to arch/x86/entry/vdso/

[firefly-linux-kernel-4.4.55.git] / arch / x86 / lib / thunk_32.S

diff --git a/arch/x86/lib/thunk_32.S b/arch/x86/lib/thunk_32.S
index 5eb715087b804e7d9cad520b46488c0270740d7c..e9acf5f4fc923caa2bd71cfa175462617130ed89 100644 (file)
--- a/arch/x86/lib/thunk_32.S
+++ b/arch/x86/lib/thunk_32.S
@@ -6,16 +6,14 @@
  */
        #include <linux/linkage.h>
        #include <asm/asm.h>
-       #include <asm/dwarf2.h>
 
        /* put return address in eax (arg1) */
        .macro THUNK name, func, put_ret_addr_in_eax=0
        .globl \name
 \name:
-       CFI_STARTPROC
-       pushl_cfi_reg eax
-       pushl_cfi_reg ecx
-       pushl_cfi_reg edx
+       pushl %eax
+       pushl %ecx
+       pushl %edx
 
        .if \put_ret_addr_in_eax
        /* Place EIP in the arg1 */
@@ -23,11 +21,10 @@
        .endif
 
        call \func
-       popl_cfi_reg edx
-       popl_cfi_reg ecx
-       popl_cfi_reg eax
+       popl %edx
+       popl %ecx
+       popl %eax
        ret
-       CFI_ENDPROC
        _ASM_NOKPROBE(\name)
        .endm