diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2005-07-27 15:47:23 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-08-30 13:52:12 +1000 |
| commit | 8913ca1c9ccb5eb6471afd419159729eef6e2730 (patch) | |
| tree | 8c0a4d1334fe6ccb3097b96426152b15fd3d8336 /arch/ppc64 | |
| parent | 597f95e2bfbe9b83ed8b0761ebf4e7d55fd4df17 (diff) | |
| download | kernel_samsung_aries-8913ca1c9ccb5eb6471afd419159729eef6e2730.zip kernel_samsung_aries-8913ca1c9ccb5eb6471afd419159729eef6e2730.tar.gz kernel_samsung_aries-8913ca1c9ccb5eb6471afd419159729eef6e2730.tar.bz2 | |
[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>
Diffstat (limited to 'arch/ppc64')
| -rw-r--r-- | arch/ppc64/mm/hash_low.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ppc64/mm/hash_low.S b/arch/ppc64/mm/hash_low.S index fbff248..35eb49e 100644 --- a/arch/ppc64/mm/hash_low.S +++ b/arch/ppc64/mm/hash_low.S @@ -129,12 +129,10 @@ _GLOBAL(__hash_page) * code rather than call a C function...) */ BEGIN_FTR_SECTION -BEGIN_FTR_SECTION mr r4,r30 mr r5,r7 bl .hash_page_do_lazy_icache -END_FTR_SECTION_IFSET(CPU_FTR_NOEXECUTE) -END_FTR_SECTION_IFCLR(CPU_FTR_COHERENT_ICACHE) +END_FTR_SECTION(CPU_FTR_NOEXECUTE|CPU_FTR_COHERENT_ICACHE, CPU_FTR_NOEXECUTE) /* At this point, r3 contains new PP bits, save them in * place of "access" in the param area (sic) |