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

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

[Torez Smith]

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

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

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

[Benjamin Herrenschmidt]

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.

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

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?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

[Benjamin Herrenschmidt]

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.