powerpc/oops: Use IS_ENABLED() for oops markers
authorMichael Ellerman <mpe@ellerman.id.au>
Wed, 23 Aug 2017 13:56:22 +0000 (23:56 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 28 Aug 2017 12:09:59 +0000 (22:09 +1000)
Just because it looks less gross.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/traps.c

index 5a54a6f54f7009ac0a7303c84194de24046ef984..f77d954f662203d9895ec263041012a2af77a9fc 100644 (file)
@@ -208,17 +208,18 @@ static int __die(const char *str, struct pt_regs *regs, long err)
        else
                printk("BE ");
 
-#ifdef CONFIG_PREEMPT
-       pr_cont("PREEMPT ");
-#endif
-#ifdef CONFIG_SMP
-       pr_cont("SMP NR_CPUS=%d ", NR_CPUS);
-#endif
+       if (IS_ENABLED(CONFIG_PREEMPT))
+               pr_cont("PREEMPT ");
+
+       if (IS_ENABLED(CONFIG_SMP))
+               pr_cont("SMP NR_CPUS=%d ", NR_CPUS);
+
        if (debug_pagealloc_enabled())
                pr_cont("DEBUG_PAGEALLOC ");
-#ifdef CONFIG_NUMA
-       pr_cont("NUMA ");
-#endif
+
+       if (IS_ENABLED(CONFIG_NUMA))
+               pr_cont("NUMA ");
+
        pr_cont("%s\n", ppc_md.name ? ppc_md.name : "");
 
        if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV) == NOTIFY_STOP)