| commit | 9cebed423c84a56b871327dd77e555d1d2186a6b | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@linux.intel.com> | Fri Sep 21 12:43:08 2012 -0700 |
| committer | H. Peter Anvin <hpa@linux.intel.com> | Fri Sep 21 12:45:25 2012 -0700 |
| tree | 7e8a59f760e1035d227b410bdeff22338807900e | |
| parent | 85fdf05cc395f23384cb0adb22765cbaa9653b54 [diff] [blame] |
x86, alternative: Use .pushsection/.popsection .section/.previous doesn't nest. Use .pushsection/.popsection in <asm/alternative.h> so that they can be properly nested. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Link: http://lkml.kernel.org/r/1348256595-29119-5-git-send-email-hpa@linux.intel.com
diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h index 952bd01..018d29f 100644 --- a/arch/x86/include/asm/alternative-asm.h +++ b/arch/x86/include/asm/alternative-asm.h
@@ -5,10 +5,10 @@ #ifdef CONFIG_SMP .macro LOCK_PREFIX 672: lock - .section .smp_locks,"a" + .pushsection .smp_locks,"a" .balign 4 .long 672b - . - .previous + .popsection .endm #else .macro LOCK_PREFIX