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>
This commit is contained in:
Jan Beulich 2014-09-24 08:40:14 +01:00 committed by Thomas Gleixner
parent 3f63572187
commit 5f1d919a8c
1 changed files with 9 additions and 11 deletions

View File

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