Commit 8913ca1c authored Jul 27, 2005 by David Gibson Committed by Paul Mackerras Aug 30, 2005

[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>

parent 597f95e2

arch/ppc64/mm/hash_low.S

+1 −3

Original line number	Diff line number	Diff line
		@@ -128,13 +128,11 @@ _GLOBAL(__hash_page)
		/* We eventually do the icache sync here (maybe inline that
		* 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)