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

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

diff --git a/kernel/arch/x86/lib/atomic64_cx8_32.S b/kernel/arch/x86/lib/atomic64_cx8_32.S
index 082a851..db3ae85 100644 (file)
--- a/kernel/arch/x86/lib/atomic64_cx8_32.S
+++ b/kernel/arch/x86/lib/atomic64_cx8_32.S
@@ -11,7 +11,6 @@
 
 #include <linux/linkage.h>
 #include <asm/alternative-asm.h>
-#include <asm/dwarf2.h>
 
 .macro read64 reg
        movl %ebx, %eax
@@ -22,16 +21,11 @@
 .endm
 
 ENTRY(atomic64_read_cx8)
-       CFI_STARTPROC
-
        read64 %ecx
        ret
-       CFI_ENDPROC
 ENDPROC(atomic64_read_cx8)
 
 ENTRY(atomic64_set_cx8)
-       CFI_STARTPROC
-
 1:
 /* we don't need LOCK_PREFIX since aligned 64-bit writes
  * are atomic on 586 and newer */
@@ -39,28 +33,23 @@ ENTRY(atomic64_set_cx8)
        jne 1b
 
        ret
-       CFI_ENDPROC
 ENDPROC(atomic64_set_cx8)
 
 ENTRY(atomic64_xchg_cx8)
-       CFI_STARTPROC
-
 1:
        LOCK_PREFIX
        cmpxchg8b (%esi)
        jne 1b
 
        ret
-       CFI_ENDPROC
 ENDPROC(atomic64_xchg_cx8)
 
 .macro addsub_return func ins insc
 ENTRY(atomic64_\func\()_return_cx8)
-       CFI_STARTPROC
-       pushl_cfi_reg ebp
-       pushl_cfi_reg ebx
-       pushl_cfi_reg esi
-       pushl_cfi_reg edi
+       pushl %ebp
+       pushl %ebx
+       pushl %esi
+       pushl %edi
 
        movl %eax, %esi
        movl %edx, %edi
@@ -79,12 +68,11 @@ ENTRY(atomic64_\func\()_return_cx8)
 10:
        movl %ebx, %eax
        movl %ecx, %edx
-       popl_cfi_reg edi
-       popl_cfi_reg esi
-       popl_cfi_reg ebx
-       popl_cfi_reg ebp
+       popl %edi
+       popl %esi
+       popl %ebx
+       popl %ebp
        ret
-       CFI_ENDPROC
 ENDPROC(atomic64_\func\()_return_cx8)
 .endm
 
@@ -93,8 +81,7 @@ addsub_return sub sub sbb
 
 .macro incdec_return func ins insc
 ENTRY(atomic64_\func\()_return_cx8)
-       CFI_STARTPROC
-       pushl_cfi_reg ebx
+       pushl %ebx
 
        read64 %esi
 1:
@@ -109,9 +96,8 @@ ENTRY(atomic64_\func\()_return_cx8)
 10:
        movl %ebx, %eax
        movl %ecx, %edx
-       popl_cfi_reg ebx
+       popl %ebx
        ret
-       CFI_ENDPROC
 ENDPROC(atomic64_\func\()_return_cx8)
 .endm
 
@@ -119,8 +105,7 @@ incdec_return inc add adc
 incdec_return dec sub sbb
 
 ENTRY(atomic64_dec_if_positive_cx8)
-       CFI_STARTPROC
-       pushl_cfi_reg ebx
+       pushl %ebx
 
        read64 %esi
 1:
@@ -136,18 +121,16 @@ ENTRY(atomic64_dec_if_positive_cx8)
 2:
        movl %ebx, %eax
        movl %ecx, %edx
-       popl_cfi_reg ebx
+       popl %ebx
        ret
-       CFI_ENDPROC
 ENDPROC(atomic64_dec_if_positive_cx8)
 
 ENTRY(atomic64_add_unless_cx8)
-       CFI_STARTPROC
-       pushl_cfi_reg ebp
-       pushl_cfi_reg ebx
+       pushl %ebp
+       pushl %ebx
 /* these just push these two parameters on the stack */
-       pushl_cfi_reg edi
-       pushl_cfi_reg ecx
+       pushl %edi
+       pushl %ecx
 
        movl %eax, %ebp
        movl %edx, %edi
@@ -168,21 +151,18 @@ ENTRY(atomic64_add_unless_cx8)
        movl $1, %eax
 3:
        addl $8, %esp
-       CFI_ADJUST_CFA_OFFSET -8
-       popl_cfi_reg ebx
-       popl_cfi_reg ebp
+       popl %ebx
+       popl %ebp
        ret
 4:
        cmpl %edx, 4(%esp)
        jne 2b
        xorl %eax, %eax
        jmp 3b
-       CFI_ENDPROC
 ENDPROC(atomic64_add_unless_cx8)
 
 ENTRY(atomic64_inc_not_zero_cx8)
-       CFI_STARTPROC
-       pushl_cfi_reg ebx
+       pushl %ebx
 
        read64 %esi
 1:
@@ -199,7 +179,6 @@ ENTRY(atomic64_inc_not_zero_cx8)
 
        movl $1, %eax
 3:
-       popl_cfi_reg ebx
+       popl %ebx
        ret
-       CFI_ENDPROC
 ENDPROC(atomic64_inc_not_zero_cx8)