From 94058794628201087fe9e50d8c4eaf3a1f406a63 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 27 Nov 2009 15:06:16 +0000 Subject: [PATCH] --- yaml --- r: 169966 b: refs/heads/master c: 99063c0bcebcc913165a5d168050326eba3e0996 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/alternative-asm.h | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 19da1a7f33fa..a17fe4e3268a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01be50a308be466e122c3a8b3d535f1b673ecbd2 +refs/heads/master: 99063c0bcebcc913165a5d168050326eba3e0996 diff --git a/trunk/arch/x86/include/asm/alternative-asm.h b/trunk/arch/x86/include/asm/alternative-asm.h index e2077d343c33..b97f786a48d5 100644 --- a/trunk/arch/x86/include/asm/alternative-asm.h +++ b/trunk/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 #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