powerpc/book3s/mm: Update Oops message to print the correct translation in use

[linux-2.6-block.git] / arch / powerpc / kernel / traps.c

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 82f43535e68674bf766680838051e92bd0a31370..014ff0701f2459c6001551ece3a51d0c7ea28dd4 100644 (file)
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -250,15 +250,22 @@ static void oops_end(unsigned long flags, struct pt_regs *regs,
 }
 NOKPROBE_SYMBOL(oops_end);
 
+static char *get_mmu_str(void)
+{
+       if (early_radix_enabled())
+               return " MMU=Radix";
+       if (early_mmu_has_feature(MMU_FTR_HPTE_TABLE))
+               return " MMU=Hash";
+       return "";
+}
+
 static int __die(const char *str, struct pt_regs *regs, long err)
 {
        printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter);
 
-       printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s%s %s\n",
+       printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s %s\n",
               IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN) ? "LE" : "BE",
-              PAGE_SIZE / 1024,
-              early_radix_enabled() ? " MMU=Radix" : "",
-              early_mmu_has_feature(MMU_FTR_HPTE_TABLE) ? " MMU=Hash" : "",
+              PAGE_SIZE / 1024, get_mmu_str(),
               IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "",
               IS_ENABLED(CONFIG_SMP) ? " SMP" : "",
               IS_ENABLED(CONFIG_SMP) ? (" NR_CPUS=" __stringify(NR_CPUS)) : "",