diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2012-09-21 15:43:08 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-09-21 15:45:25 -0400 |
| commit | 9cebed423c84a56b871327dd77e555d1d2186a6b (patch) | |
| tree | 7e8a59f760e1035d227b410bdeff22338807900e | |
| parent | 85fdf05cc395f23384cb0adb22765cbaa9653b54 (diff) | |
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
| -rw-r--r-- | arch/x86/include/asm/alternative-asm.h | 4 | ||||
| -rw-r--r-- | arch/x86/include/asm/alternative.h | 32 |
2 files changed, 18 insertions, 18 deletions
diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h index 952bd0100c5c..018d29fe634a 100644 --- a/arch/x86/include/asm/alternative-asm.h +++ b/arch/x86/include/asm/alternative-asm.h | |||
| @@ -5,10 +5,10 @@ | |||
| 5 | #ifdef CONFIG_SMP | 5 | #ifdef CONFIG_SMP |
| 6 | .macro LOCK_PREFIX | 6 | .macro LOCK_PREFIX |
| 7 | 672: lock | 7 | 672: lock |
| 8 | .section .smp_locks,"a" | 8 | .pushsection .smp_locks,"a" |
| 9 | .balign 4 | 9 | .balign 4 |
| 10 | .long 672b - . | 10 | .long 672b - . |
| 11 | .previous | 11 | .popsection |
| 12 | .endm | 12 | .endm |
| 13 | #else | 13 | #else |
| 14 | .macro LOCK_PREFIX | 14 | .macro LOCK_PREFIX |
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h index 70780689599a..87bc00d4efe9 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h | |||
| @@ -29,10 +29,10 @@ | |||
| 29 | 29 | ||
| 30 | #ifdef CONFIG_SMP | 30 | #ifdef CONFIG_SMP |
| 31 | #define LOCK_PREFIX_HERE \ | 31 | #define LOCK_PREFIX_HERE \ |
| 32 | ".section .smp_locks,\"a\"\n" \ | 32 | ".pushsection .smp_locks,\"a\"\n" \ |
| 33 | ".balign 4\n" \ | 33 | ".balign 4\n" \ |
| 34 | ".long 671f - .\n" /* offset */ \ | 34 | ".long 671f - .\n" /* offset */ \ |
| 35 | ".previous\n" \ | 35 | ".popsection\n" \ |
| 36 | "671:" | 36 | "671:" |
| 37 | 37 | ||
| 38 | #define LOCK_PREFIX LOCK_PREFIX_HERE "\n\tlock; " | 38 | #define LOCK_PREFIX LOCK_PREFIX_HERE "\n\tlock; " |
| @@ -99,30 +99,30 @@ static inline int alternatives_text_reserved(void *start, void *end) | |||
| 99 | /* alternative assembly primitive: */ | 99 | /* alternative assembly primitive: */ |
| 100 | #define ALTERNATIVE(oldinstr, newinstr, feature) \ | 100 | #define ALTERNATIVE(oldinstr, newinstr, feature) \ |
| 101 | OLDINSTR(oldinstr) \ | 101 | OLDINSTR(oldinstr) \ |
| 102 | ".section .altinstructions,\"a\"\n" \ | 102 | ".pushsection .altinstructions,\"a\"\n" \ |
| 103 | ALTINSTR_ENTRY(feature, 1) \ | 103 | ALTINSTR_ENTRY(feature, 1) \ |
| 104 | ".previous\n" \ | 104 | ".popsection\n" \ |
| 105 | ".section .discard,\"aw\",@progbits\n" \ | 105 | ".pushsection .discard,\"aw\",@progbits\n" \ |
| 106 | DISCARD_ENTRY(1) \ | 106 | DISCARD_ENTRY(1) \ |
| 107 | ".previous\n" \ | 107 | ".popsection\n" \ |
| 108 | ".section .altinstr_replacement, \"ax\"\n" \ | 108 | ".pushsection .altinstr_replacement, \"ax\"\n" \ |
| 109 | ALTINSTR_REPLACEMENT(newinstr, feature, 1) \ | 109 | ALTINSTR_REPLACEMENT(newinstr, feature, 1) \ |
| 110 | ".previous" | 110 | ".popsection" |
| 111 | 111 | ||
| 112 | #define ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2)\ | 112 | #define ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2)\ |
| 113 | OLDINSTR(oldinstr) \ | 113 | OLDINSTR(oldinstr) \ |
| 114 | ".section .altinstructions,\"a\"\n" \ | 114 | ".pushsection .altinstructions,\"a\"\n" \ |
| 115 | ALTINSTR_ENTRY(feature1, 1) \ | 115 | ALTINSTR_ENTRY(feature1, 1) \ |
| 116 | ALTINSTR_ENTRY(feature2, 2) \ | 116 | ALTINSTR_ENTRY(feature2, 2) \ |
| 117 | ".previous\n" \ | 117 | ".popsection\n" \ |
| 118 | ".section .discard,\"aw\",@progbits\n" \ | 118 | ".pushsection .discard,\"aw\",@progbits\n" \ |
| 119 | DISCARD_ENTRY(1) \ | 119 | DISCARD_ENTRY(1) \ |
| 120 | DISCARD_ENTRY(2) \ | 120 | DISCARD_ENTRY(2) \ |
| 121 | ".previous\n" \ | 121 | ".popsection\n" \ |
| 122 | ".section .altinstr_replacement, \"ax\"\n" \ | 122 | ".pushsection .altinstr_replacement, \"ax\"\n" \ |
| 123 | ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \ | 123 | ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \ |
| 124 | ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \ | 124 | ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \ |
| 125 | ".previous" | 125 | ".popsection" |
| 126 | 126 | ||
| 127 | /* | 127 | /* |
| 128 | * This must be included *after* the definition of ALTERNATIVE due to | 128 | * This must be included *after* the definition of ALTERNATIVE due to |