powerpc/process: Replace an #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE) by IS_EN...
authorChristophe Leroy <christophe.leroy@csgroup.eu>
Mon, 17 Aug 2020 05:46:43 +0000 (05:46 +0000)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 15 Sep 2020 12:13:34 +0000 (22:13 +1000)
The #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE) encloses some
printk which can be compiled in all cases.

Replace by IS_ENABLED().

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/a1b6ef3d657c8f249193442f56868fc358ea5b6c.1597643160.git.christophe.leroy@csgroup.eu
arch/powerpc/kernel/process.c

index 47c4012..4c20136 100644 (file)
@@ -1502,12 +1502,13 @@ void show_regs(struct pt_regs * regs)
        trap = TRAP(regs);
        if (!trap_is_syscall(regs) && cpu_has_feature(CPU_FTR_CFAR))
                pr_cont("CFAR: "REG" ", regs->orig_gpr3);
-       if (trap == 0x200 || trap == 0x300 || trap == 0x600)
-#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
-               pr_cont("DEAR: "REG" ESR: "REG" ", regs->dar, regs->dsisr);
-#else
-               pr_cont("DAR: "REG" DSISR: %08lx ", regs->dar, regs->dsisr);
-#endif
+       if (trap == 0x200 || trap == 0x300 || trap == 0x600) {
+               if (IS_ENABLED(CONFIG_4xx) || IS_ENABLED(CONFIG_BOOKE))
+                       pr_cont("DEAR: "REG" ESR: "REG" ", regs->dar, regs->dsisr);
+               else
+                       pr_cont("DAR: "REG" DSISR: %08lx ", regs->dar, regs->dsisr);
+       }
+
 #ifdef CONFIG_PPC64
        pr_cont("IRQMASK: %lx ", regs->softe);
 #endif