[PATCH] bug fix in arch/powerpc/mm/tlb_nohash_low.S

Torez Smith lnxtorez at linux.vnet.ibm.com
Mon May 18 14:49:06 EST 2009


File arch/powerpc/mm/tlb_nohash_low.S defines various processor specific low level TLB invalidation. Most all family of validations are grouped via pre-processor defines with the intent we error out if we reach the end and our platform is not represented. Given this, the last few lines of the file should look similar to the following....
<<  SNIP  >>
1:      wrtee   r10
        blr
#else
#error Unsupported processor type !
#endif

However, the #else is incorrectly written as #elif.  On some of the newer compilers/assemblers, this will not successfully assemble and will cause an error.

Signed-off-by: Torez Smith  <lnxtorez at linux.vnet.ibm.com>
---

Index: linux-2.6.29/arch/powerpc/mm/tlb_nohash_low.S
===================================================================
--- linux-2.6.29.orig/arch/powerpc/mm/tlb_nohash_low.S	2009-05-17 21:31:20.000000000 -0500
+++ linux-2.6.29/arch/powerpc/mm/tlb_nohash_low.S	2009-05-17 21:31:40.000000000 -0500
@@ -161,6 +161,6 @@
 	isync
 1:	wrtee	r10
 	blr
-#elif
+#else
 #error Unsupported processor type !
 #endif

-- 
Torez Smith
IBM Linux Technology Center




More information about the Linuxppc-dev mailing list