patch-5.15.79-rt54.patch

[platform/kernel/linux-rpi.git] / arch / powerpc / kernel / traps.c

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 1174170..7e4e1f4 100644 (file)
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -260,12 +260,17 @@ static char *get_mmu_str(void)
 
 static int __die(const char *str, struct pt_regs *regs, long err)
 {
+       const char *pr = "";
+
        printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter);
 
+       if (IS_ENABLED(CONFIG_PREEMPTION))
+               pr = IS_ENABLED(CONFIG_PREEMPT_RT) ? " PREEMPT_RT" : " PREEMPT";
+
        printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s %s\n",
               IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN) ? "LE" : "BE",
               PAGE_SIZE / 1024, get_mmu_str(),
-              IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "",
+              pr,
               IS_ENABLED(CONFIG_SMP) ? " SMP" : "",
               IS_ENABLED(CONFIG_SMP) ? (" NR_CPUS=" __stringify(NR_CPUS)) : "",
               debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "",