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

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

diff --git a/kernel/arch/x86/lib/cmpxchg8b_emu.S b/kernel/arch/x86/lib/cmpxchg8b_emu.S
index b4807fc..ad53497 100644 (file)
--- a/kernel/arch/x86/lib/cmpxchg8b_emu.S
+++ b/kernel/arch/x86/lib/cmpxchg8b_emu.S
@@ -7,7 +7,6 @@
  */
 
 #include <linux/linkage.h>
-#include <asm/dwarf2.h>
 
 .text
 
@@ -20,14 +19,13 @@
  * %ecx : high 32 bits of new value
  */
 ENTRY(cmpxchg8b_emu)
-CFI_STARTPROC
 
 #
 # Emulate 'cmpxchg8b (%esi)' on UP except we don't
 # set the whole ZF thing (caller will just compare
 # eax:edx with the expected value)
 #
-       pushfl_cfi
+       pushfl
        cli
 
        cmpl  (%esi), %eax
@@ -38,18 +36,15 @@ CFI_STARTPROC
        movl %ebx,  (%esi)
        movl %ecx, 4(%esi)
 
-       CFI_REMEMBER_STATE
-       popfl_cfi
+       popfl
        ret
 
-       CFI_RESTORE_STATE
 .Lnot_same:
        movl  (%esi), %eax
 .Lhalf_same:
        movl 4(%esi), %edx
 
-       popfl_cfi
+       popfl
        ret
 
-CFI_ENDPROC
 ENDPROC(cmpxchg8b_emu)