Patchwork bug fix in arch/powerpc/mm/tlb_nohash_low.S

login
register
mail settings
Submitter Torez Smith
Date May 18, 2009, 4:49 a.m.
Message ID <1242622146.31702.26.camel@torez.austin.ibm.com>
Download mbox | patch
Permalink /patch/27333/
State Superseded, archived
Headers show

Comments

Torez Smith - May 18, 2009, 4:49 a.m.
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@linux.vnet.ibm.com>
---
Benjamin Herrenschmidt - May 18, 2009, 5:12 a.m.
On Sun, 2009-05-17 at 23:49 -0500, Torez Smith wrote:
> 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.

Thanks, but it's been fixed already :-)

See commit b62c31ae401c6df25c61b206681a6e904ef97169.

Cheers,
Ben.
Stephen Rothwell - May 18, 2009, 5:47 a.m.
Hi Ben,

On Mon, 18 May 2009 15:12:03 +1000 Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
>
> Thanks, but it's been fixed already :-)
> 
> See commit b62c31ae401c6df25c61b206681a6e904ef97169.

Should this be submitted for 2.6.29 stable?
Benjamin Herrenschmidt - May 18, 2009, 5:52 a.m.
On Mon, 2009-05-18 at 15:47 +1000, Stephen Rothwell wrote:
> Hi Ben,
> 
> On Mon, 18 May 2009 15:12:03 +1000 Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
> >
> > Thanks, but it's been fixed already :-)
> > 
> > See commit b62c31ae401c6df25c61b206681a6e904ef97169.
> 
> Should this be submitted for 2.6.29 stable?

Probably, will do.

Cheers,
Ben.

Patch

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