x86: Improve cmpxchg8b_emu.S

- don't include unneeded headers
- drop redundant entry point label
- complete unwind annotations
- use .L prefix on local labels to not clutter the symbol table

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Link: http://lkml.kernel.org/r/5422917E0200007800038081@mail.emea.novell.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/x86/lib/cmpxchg8b_emu.S b/arch/x86/lib/cmpxchg8b_emu.S
index 828cb71..b4807fc 100644 (file)
--- a/arch/x86/lib/cmpxchg8b_emu.S
+++ b/arch/x86/lib/cmpxchg8b_emu.S
@@ -7,11 +7,8 @@
  */
 
 #include <linux/linkage.h>
-#include <asm/alternative-asm.h>
-#include <asm/frame.h>
 #include <asm/dwarf2.h>
 
-
 .text
 
 /*
@@ -30,27 +27,28 @@ CFI_STARTPROC
 # set the whole ZF thing (caller will just compare
 # eax:edx with the expected value)
 #
-cmpxchg8b_emu:
-       pushfl
+       pushfl_cfi
        cli
 
        cmpl  (%esi), %eax
-       jne not_same
+       jne .Lnot_same
        cmpl 4(%esi), %edx
-       jne half_same
+       jne .Lhalf_same
 
        movl %ebx,  (%esi)
        movl %ecx, 4(%esi)
 
-       popfl
+       CFI_REMEMBER_STATE
+       popfl_cfi
        ret
 
- not_same:
+       CFI_RESTORE_STATE
+.Lnot_same:
        movl  (%esi), %eax
- half_same:
+.Lhalf_same:
        movl 4(%esi), %edx
 
-       popfl
+       popfl_cfi
        ret
 
 CFI_ENDPROC