x86/alternatives: no need for alternatives-asm.h to re-invent stuff already in asm.h
PATCH 1/1 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 <[email protected]>
--- arch/x86/include/asm/alternative-asm.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
arch/x86/include/asm/alternative-asm.h +3 -7
@@ -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
[tip:x86/asm] x86/alternatives: No need for alternatives-asm.h to re-invent stuff already in asm.h
Commit-ID: 99063c0bcebcc913165a5d168050326eba3e0996 Gitweb: http://git.kernel.org/tip/99063c0bcebcc913165a5d168050326eba3e0996 Author: Jan Beulich <[email protected]> AuthorDate: Fri, 27 Nov 2009 15:06:16 +0000 Committer: Ingo Molnar <[email protected]> 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 <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/include/asm/alternative-asm.h | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-)
arch/x86/include/asm/alternative-asm.h +3 -7
@@ -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