Patchwork [v2] powerpc: fix for long standing bug noticed by gcc 4.4.0

login
register
mail settings
Submitter Stephen Rothwell
Date April 23, 2009, 12:56 p.m.
Message ID <20090423225611.d569764c.sfr@canb.auug.org.au>
Download mbox | patch
Permalink /patch/26365/
State Accepted
Headers show

Comments

Stephen Rothwell - April 23, 2009, 12:56 p.m.
Previous gcc versions didn't notice this because one of the preceding
#ifs always evaluated to true.

gcc 4.4.0 produced this error:

arch/powerpc/mm/tlb_nohash_low.S:206:6: error: #elif with no expression

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
---
 arch/powerpc/mm/tlb_nohash_low.S |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

v2: fixed up commit message, added Josh'd Ack.
Kumar Gala - April 23, 2009, 1:55 p.m.
On Apr 23, 2009, at 7:56 AM, Stephen Rothwell wrote:

> Previous gcc versions didn't notice this because one of the preceding
> #ifs always evaluated to true.
>
> gcc 4.4.0 produced this error:
>
> arch/powerpc/mm/tlb_nohash_low.S:206:6: error: #elif with no  
> expression
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
> ---
> arch/powerpc/mm/tlb_nohash_low.S |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> v2: fixed up commit message, added Josh'd Ack.

applied to merge.  Picking this up as I'm touching tlb_nohash_low.S w/ 
another "fix".

- k

Patch

diff --git a/arch/powerpc/mm/tlb_nohash_low.S b/arch/powerpc/mm/tlb_nohash_low.S
index 45fed36..21e1b9a 100644
--- a/arch/powerpc/mm/tlb_nohash_low.S
+++ b/arch/powerpc/mm/tlb_nohash_low.S
@@ -203,6 +203,6 @@  ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_USE_TLBILX)
 	isync
 1:	wrtee	r10
 	blr
-#elif
+#else
 #error Unsupported processor type !
 #endif