[tip:x86/asm] x86/alternatives: No need for alternatives-asm.h to re-invent stuff already in asm.h

[tip-bot for Jan Beulich]

Commit-ID:  99063c0bcebcc913165a5d168050326eba3e0996
Gitweb:     http://git.kernel.org/tip/99063c0bcebcc913165a5d168050326eba3e0996
Author:     Jan Beulich <JBeulich@xxxxxxxxxx>
AuthorDate: Fri, 27 Nov 2009 15:06:16 +0000
Committer:  Ingo Molnar <mingo@xxxxxxx>
CommitDate: Wed, 2 Dec 2009 11:39:45 +0100

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@xxxxxxxxxx>
LKML-Reference: <4B0FF8F80200007800022708@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
 arch/x86/include/asm/alternative-asm.h |   10 +++-------
 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
--
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/