diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 19:35:37 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-18 19:35:37 +0400 |
| commit | 7421a10de7a525f67cc082fca7a91011d00eada4 (patch) | |
| tree | 6b4509858003c6cf140e223e1dcc4250def2c75c /arch/x86/include/asm/alternative.h | |
| parent | 752f114fb83c5839de37a250b4f8257ed5438341 (diff) | |
| parent | 9e565292270a2d55524be38835104c564ac8f795 (diff) | |
| download | linux-7421a10de7a525f67cc082fca7a91011d00eada4.tar.xz | |
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Use .cfi_sections for assembly code
x86-64: Reduce SMP locks table size
x86, asm: Introduce and use percpu_inc()
Diffstat (limited to 'arch/x86/include/asm/alternative.h')
| -rw-r--r-- | arch/x86/include/asm/alternative.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h index b09ec55650b3..714bf2417284 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h @@ -30,8 +30,8 @@ #ifdef CONFIG_SMP #define LOCK_PREFIX \ ".section .smp_locks,\"a\"\n" \ - _ASM_ALIGN "\n" \ - _ASM_PTR "661f\n" /* address */ \ + ".balign 4\n" \ + ".long 661f - .\n" /* offset */ \ ".previous\n" \ "661:\n\tlock; " |