diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/x86/include/asm/alternative-asm.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/x86/include/asm/alternative-asm.h')
| -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 e2077d343c3..b97f786a48d 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 |