Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
[linux-2.6.git] / arch / x86 / include / asm / alternative-asm.h
1 #ifdef __ASSEMBLY__
2
3 #include <asm/asm.h>
4
5 #ifdef CONFIG_SMP
6         .macro LOCK_PREFIX
7 1:      lock
8         .section .smp_locks,"a"
9         .balign 4
10         .long 1b - .
11         .previous
12         .endm
13 #else
14         .macro LOCK_PREFIX
15         .endm
16 #endif
17
18 .macro altinstruction_entry orig alt feature orig_len alt_len
19         .align 8
20         .long \orig - .
21         .long \alt - .
22         .word \feature
23         .byte \orig_len
24         .byte \alt_len
25 .endm
26
27 #endif  /*  __ASSEMBLY__  */