* [PATCH] x86/alternatives: no need for alternatives-asm.h to re-invent stuff already in asm.h
@ 2009-11-27 15:06 Jan Beulich
2009-12-02 10:46 ` [tip:x86/asm] x86/alternatives: No " tip-bot for Jan Beulich
0 siblings, 1 reply; 2+ messages in thread
From: Jan Beulich @ 2009-11-27 15:06 UTC (permalink / raw)
To: mingo, tglx, hpa; +Cc: linux-kernel
This at once also gets the alignment specification right for x86-64.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
---
arch/x86/include/asm/alternative-asm.h | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
--- linux-2.6.32-rc8/arch/x86/include/asm/alternative-asm.h
+++ 2.6.32-rc8-x86-alternative/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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tip:x86/asm] x86/alternatives: No need for alternatives-asm.h to re-invent stuff already in asm.h
2009-11-27 15:06 [PATCH] x86/alternatives: no need for alternatives-asm.h to re-invent stuff already in asm.h Jan Beulich
@ 2009-12-02 10:46 ` tip-bot for Jan Beulich
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Jan Beulich @ 2009-12-02 10:46 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, jbeulich, JBeulich, tglx, mingo
Commit-ID: 99063c0bcebcc913165a5d168050326eba3e0996
Gitweb: http://git.kernel.org/tip/99063c0bcebcc913165a5d168050326eba3e0996
Author: Jan Beulich <JBeulich@novell.com>
AuthorDate: Fri, 27 Nov 2009 15:06:16 +0000
Committer: Ingo Molnar <mingo@elte.hu>
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@novell.com>
LKML-Reference: <4B0FF8F80200007800022708@vpn.id2.novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-12-02 10:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-27 15:06 [PATCH] x86/alternatives: no need for alternatives-asm.h to re-invent stuff already in asm.h Jan Beulich
2009-12-02 10:46 ` [tip:x86/asm] x86/alternatives: No " tip-bot for Jan Beulich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®