[PPC64] Remove nested feature sections

David Gibson david at gibson.dropbear.id.au
Wed Jul 27 15:47:23 EST 2005

Andrew, please apply:

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

Signed-off-by: David Gibson <dwg at au1.ibm.com>

Index: working-2.6/arch/ppc64/mm/hash_low.S
--- working-2.6.orig/arch/ppc64/mm/hash_low.S	2005-07-26 10:36:48.000000000 +1000
+++ working-2.6/arch/ppc64/mm/hash_low.S	2005-07-26 17:35:49.000000000 +1000
@@ -129,12 +129,10 @@
 	 * code rather than call a C function...) 
 	mr	r4,r30
 	mr	r5,r7
 	bl	.hash_page_do_lazy_icache
 	/* At this point, r3 contains new PP bits, save them in
 	 * place of "access" in the param area (sic)

David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!

More information about the Linuxppc64-dev mailing list