Commit 99063c0b authored Nov 27, 2009 by Jan Beulich Committed by Ingo Molnar Dec 02, 2009

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>

parent 01be50a3

arch/x86/include/asm/alternative-asm.h

+3 −7

Original line number	Diff line number	Diff line
		#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