]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[POWERPC] Fix a compiler warning in mm/tlb_64.c
authorMichael Ellerman <michael@ellerman.id.au>
Thu, 13 Jul 2006 07:54:44 +0000 (17:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Jul 2006 08:43:25 +0000 (18:43 +1000)
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>
arch/powerpc/mm/tlb_64.c

index f6eef78efd293212dbb55966650c9a62d2a4ad89..b58baa65c4a74f11978baf41bee0e04c428d19f6 100644 (file)
@@ -146,6 +146,7 @@ void hpte_update(struct mm_struct *mm, unsigned long addr,
                psize = mmu_huge_psize;
 #else
                BUG();
                psize = mmu_huge_psize;
 #else
                BUG();
+               psize = pte_pagesize_index(pte); /* shutup gcc */
 #endif
        } else
                psize = pte_pagesize_index(pte);
 #endif
        } else
                psize = pte_pagesize_index(pte);