Commit 16842516 authored Jan 10, 2019 by Michael Ellerman

powerpc/64s: Add MMU type to __die() output



On Power9 machines (64-bit Book3S), we can be running with either the
Hash table or Radix tree MMU enabled. So add some text to the __die()
output to tell us which is enabled, for the case where all you have is
the oops output and no other information.

Example output:

  kernel BUG at drivers/misc/lkdtm/bugs.c:63!
  Oops: Exception in kernel mode, sig: 5 [#1]
  LE PAGE_SIZE=64K MMU=Hash SMP NR_CPUS=2048 NUMA pSeries
  Modules linked in: kvm vmx_crypto binfmt_misc ip_tables x_tables

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent 18405139

arch/powerpc/kernel/traps.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -257,9 +257,11 @@ 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\n",
		printk("%s PAGE_SIZE=%luK%s%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" : "",
		IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "",
		IS_ENABLED(CONFIG_SMP) ? " SMP" : "",
		IS_ENABLED(CONFIG_SMP) ? (" NR_CPUS=" __stringify(NR_CPUS)) : "",