diff options
| -rw-r--r-- | 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 e2077d343c33..b97f786a48d5 100644 --- a/arch/x86/include/asm/alternative-asm.h +++ b/arch/x86/include/asm/alternative-asm.h | |||
| @@ -1,17 +1,13 @@ | |||
| 1 | #ifdef __ASSEMBLY__ | 1 | #ifdef __ASSEMBLY__ |
| 2 | 2 | ||
| 3 | #ifdef CONFIG_X86_32 | 3 | #include <asm/asm.h> |
| 4 | # define X86_ALIGN .long | ||
| 5 | #else | ||
| 6 | # define X86_ALIGN .quad | ||
| 7 | #endif | ||
| 8 | 4 | ||
| 9 | #ifdef CONFIG_SMP | 5 | #ifdef CONFIG_SMP |
| 10 | .macro LOCK_PREFIX | 6 | .macro LOCK_PREFIX |
| 11 | 1: lock | 7 | 1: lock |
| 12 | .section .smp_locks,"a" | 8 | .section .smp_locks,"a" |
| 13 | .align 4 | 9 | _ASM_ALIGN |
| 14 | X86_ALIGN 1b | 10 | _ASM_PTR 1b |
| 15 | .previous | 11 | .previous |
| 16 | .endm | 12 | .endm |
| 17 | #else | 13 | #else |
