summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@novell.com>2009-11-27 15:06:16 +0000
committerIngo Molnar <mingo@elte.hu>2009-12-02 11:39:45 +0100
commit99063c0bcebcc913165a5d168050326eba3e0996 (patch)
treea5a99bd264b06fa06936ee863e9778eaa775caa6
parent01be50a308be466e122c3a8b3d535f1b673ecbd2 (diff)
downloadop-kernel-dev-99063c0bcebcc913165a5d168050326eba3e0996.zip
op-kernel-dev-99063c0bcebcc913165a5d168050326eba3e0996.tar.gz
x86/alternatives: No need for alternatives-asm.h to re-invent stuff already in asm.h
This at once also gets the alignment specification right for x86-64. Signed-off-by: Jan Beulich <jbeulich@novell.com> LKML-Reference: <4B0FF8F80200007800022708@vpn.id2.novell.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/include/asm/alternative-asm.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
index e2077d3..b97f786 100644
--- a/arch/x86/include/asm/alternative-asm.h
+++ b/arch/x86/include/asm/alternative-asm.h
@@ -1,17 +1,13 @@
#ifdef __ASSEMBLY__
-#ifdef CONFIG_X86_32
-# define X86_ALIGN .long
-#else
-# define X86_ALIGN .quad
-#endif
+#include <asm/asm.h>
#ifdef CONFIG_SMP
.macro LOCK_PREFIX
1: lock
.section .smp_locks,"a"
- .align 4
- X86_ALIGN 1b
+ _ASM_ALIGN
+ _ASM_PTR 1b
.previous
.endm
#else
OpenPOWER on IntegriCloud