linux-next: upstream tree build failure

[Josh Boyer]

On Thu, Apr 23, 2009 at 04:06:56PM +1000, Stephen Rothwell wrote:
>Hi all,
>
>[I am now using gcc version 4.4.0 ...]
>
>Today's linux-next build (powerpc ppc44x_defconfig) failed like this:
>
>arch/powerpc/mm/tlb_nohash_low.S:206:6: error: #elif with no expression
>
>Previous gcc versions didn't notice this because one of the preceding
>#ifs always evaluated to true.  I have applied the following patch for today.
>
>-- 
>Cheers,
>Stephen Rothwell                    sfr at canb.auug.org.au
>http://www.canb.auug.org.au/~sfr/
>
>From: Stephen Rothwell <sfr at canb.auug.org.au>
>Date: Thu, 23 Apr 2009 16:00:47 +1000
>Subject: [PATCH] powerpc: fix for long standing bug noticed by gcc 4.4.0
>
>Previous gcc versions didn't notice this because one of the preceding
>
>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 at canb.auug.org.au>

Your changelog got truncated in the first sentence.  No big deal.

I have a gcc 4.4.0 system as well.  I'll try a bunch of various builds to see
if it catches anything else.  This fix looks good to me in the meantime.

Acked-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>

josh

>---
> arch/powerpc/mm/tlb_nohash_low.S |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>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