summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/frame.h
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@novell.com>2011-07-19 15:59:51 +0400
committerIngo Molnar <mingo@elte.hu>2011-07-21 11:03:31 +0400
commit4625cd637919edfb562e0d62abf94f52e9321335 (patch)
tree88c4cf965722fb54731a6e8f632ec6ef6e83e194 /arch/x86/include/asm/frame.h
parentdd2897bf0f4d523238e87dabb23e9634ea9ba73d (diff)
downloadlinux-4625cd637919edfb562e0d62abf94f52e9321335.tar.xz
x86: Unify rwlock assembly implementation
Rather than having two functionally identical implementations for 32- and 64-bit configurations, extend the existing assembly abstractions enough to fold the two rwlock implementations into a shared one. Signed-off-by: Jan Beulich <jbeulich@novell.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/4E258DD7020000780004E3EA@nat28.tlf.novell.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/frame.h')
-rw-r--r--arch/x86/include/asm/frame.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/x86/include/asm/frame.h b/arch/x86/include/asm/frame.h
index 2c6fc9e62812..3b629f47eb65 100644
--- a/arch/x86/include/asm/frame.h
+++ b/arch/x86/include/asm/frame.h
@@ -1,5 +1,6 @@
#ifdef __ASSEMBLY__
+#include <asm/asm.h>
#include <asm/dwarf2.h>
/* The annotation hides the frame from the unwinder and makes it look
@@ -7,13 +8,13 @@
frame pointer later */
#ifdef CONFIG_FRAME_POINTER
.macro FRAME
- pushl_cfi %ebp
- CFI_REL_OFFSET ebp,0
- movl %esp,%ebp
+ __ASM_SIZE(push,_cfi) %__ASM_REG(bp)
+ CFI_REL_OFFSET __ASM_REG(bp), 0
+ __ASM_SIZE(mov) %__ASM_REG(sp), %__ASM_REG(bp)
.endm
.macro ENDFRAME
- popl_cfi %ebp
- CFI_RESTORE ebp
+ __ASM_SIZE(pop,_cfi) %__ASM_REG(bp)
+ CFI_RESTORE __ASM_REG(bp)
.endm
#else
.macro FRAME