From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 23 Apr 2009 12:56:11 +0000 (+1000)
Subject: powerpc: fix for long standing bug noticed by gcc 4.4.0
X-Git-Tag: v2.6.29.5~32
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1e4f26e2ab78b52720c3ef2b3c5fb015b11c4867;p=karo-tx-linux.git

powerpc: fix for long standing bug noticed by gcc 4.4.0

commit b62c31ae401c6df25c61b206681a6e904ef97169 upstream.

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>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/arch/powerpc/mm/tlb_nohash_low.S b/arch/powerpc/mm/tlb_nohash_low.S
index f900a39e6ec4..3bc41c390dc2 100644
--- a/arch/powerpc/mm/tlb_nohash_low.S
+++ b/arch/powerpc/mm/tlb_nohash_low.S
@@ -161,6 +161,6 @@ _GLOBAL(_tlbil_va)
 	isync
 1:	wrtee	r10
 	blr
-#elif
+#else
 #error Unsupported processor type !
 #endif