[PATCH 3/5] powerpc/oops: Use IS_ENABLED() for oops markers
Michael Ellerman
mpe at ellerman.id.au
Wed Aug 23 23:56:22 AEST 2017
Just because it looks less gross.
Signed-off-by: Michael Ellerman <mpe at ellerman.id.au>
---
arch/powerpc/kernel/traps.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 5a54a6f54f70..f77d954f6622 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -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)
--
2.7.4
More information about the Linuxppc-dev
mailing list