From: Michael Ellerman <michael@ellerman.id.au>
Date: Thu, 13 Jul 2006 07:54:44 +0000 (+1000)
Subject: [POWERPC] Fix a compiler warning in mm/tlb_64.c
X-Git-Tag: v2.6.19-rc1~1300^2~89^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d69ff32ebf3dff9e9b48bbbbafe2b9b6f188d48;p=linux-2.6

[POWERPC] Fix a compiler warning in mm/tlb_64.c

The compiler doesn't understand that BUG() never returns, so complains that
psize isn't set. Just set it to the normal value, which seems to produce nice
code and keeps gcc happy.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---

diff --git a/arch/powerpc/mm/tlb_64.c b/arch/powerpc/mm/tlb_64.c
index f6eef78efd..b58baa65c4 100644
--- a/arch/powerpc/mm/tlb_64.c
+++ b/arch/powerpc/mm/tlb_64.c
@@ -146,6 +146,7 @@ void hpte_update(struct mm_struct *mm, unsigned long addr,
 		psize = mmu_huge_psize;
 #else
 		BUG();
+		psize = pte_pagesize_index(pte); /* shutup gcc */
 #endif
 	} else
 		psize = pte_pagesize_index(pte);