[PATCH] ix86: improve cmpxchg8b_emu.S

From: Jan Beulich
Date: Wed Sep 24 2014 - 03:40:23 EST


- 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@xxxxxxxx>
---
arch/x86/lib/cmpxchg8b_emu.S | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)

--- 3.17-rc6/arch/x86/lib/cmpxchg8b_emu.S
+++ 3.17-rc6-ix86-improve-cmpxchg8b_emu/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



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/