Commit 8913ca1c9ccb5eb6471afd419159729eef6e2730
Committed by
Paul Mackerras
Paul Mackerras
1 parent
597f95e2bf
Exists in
master
and in
4 other branches
[PATCH] Remove nested feature sections
The {BEGIN,END}_FTR_SECTION asm macros used in ppc64 to nop out
sections of code at runtime cannot be nested. However, we do nest
them in hash_low.S. We get away with it there, because there is
nothing between the BEGIN markers for each section. However, that's
confusing to someone reading the code.
This patch removes the nested ifset and ifclr feature sections,
replacing them with a single feature section in the full mask/value
form.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Showing 1 changed file with 1 additions and 3 deletions Side-by-side Diff
arch/ppc64/mm/hash_low.S
| ... | ... | @@ -129,12 +129,10 @@ |
| 129 | 129 | * code rather than call a C function...) |
| 130 | 130 | */ |
| 131 | 131 | BEGIN_FTR_SECTION |
| 132 | -BEGIN_FTR_SECTION | |
| 133 | 132 | mr r4,r30 |
| 134 | 133 | mr r5,r7 |
| 135 | 134 | bl .hash_page_do_lazy_icache |
| 136 | -END_FTR_SECTION_IFSET(CPU_FTR_NOEXECUTE) | |
| 137 | -END_FTR_SECTION_IFCLR(CPU_FTR_COHERENT_ICACHE) | |
| 135 | +END_FTR_SECTION(CPU_FTR_NOEXECUTE|CPU_FTR_COHERENT_ICACHE, CPU_FTR_NOEXECUTE) | |
| 138 | 136 | |
| 139 | 137 | /* At this point, r3 contains new PP bits, save them in |
| 140 | 138 | * place of "access" in the param area (sic) |