Merge commit 'v2.6.28-rc7' into core/locking
[sfrench/cifs-2.6.git] / arch / x86 / include / asm / alternative-asm.h
1 #ifdef __ASSEMBLY__
2
3 #ifdef CONFIG_X86_32
4 # define X86_ALIGN .long
5 #else
6 # define X86_ALIGN .quad
7 #endif
8
9 #ifdef CONFIG_SMP
10         .macro LOCK_PREFIX
11 1:      lock
12         .section .smp_locks,"a"
13         .align 4
14         X86_ALIGN 1b
15         .previous
16         .endm
17 #else
18         .macro LOCK_PREFIX
19         .endm
20 #endif
21
22 #endif  /*  __ASSEMBLY__  */