Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-04-23 22:56:11 +1000
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-15 09:40:15 -0700
commit1e4f26e2ab78b52720c3ef2b3c5fb015b11c4867 (patch)
tree3acb9a8e814230dd995c62b9d9579215a193e01f
parent05a0478d956820a6f168ed9f65c00da688cc5751 (diff)
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>
-rw-r--r--arch/powerpc/mm/tlb_nohash_low.S2
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 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