powerpc/64: change softe to irqmask in show_regs and xmon

When the soft enabled flag was changed to a soft disable mask, xmon
and register dump code was not updated to reflect that, which is
confusing ('SOFTE: 1' previously meant interrupts were soft enabled,
currently it means the opposite, the general interrupt type has been
disabled).

Fix this by using the name irqmask, and printing it in hex.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Acked-by: Balbir Singh <bsingharora@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 2a7fa5000ccecec51c630b13bba63434790e1ed6..8f35b30956f430135f9ebeafa968bb75e9b109d9 100644 (file)
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1420,7 +1420,7 @@ void show_regs(struct pt_regs * regs)
                pr_cont("DAR: "REG" DSISR: %08lx ", regs->dar, regs->dsisr);
 #endif
 #ifdef CONFIG_PPC64
-       pr_cont("SOFTE: %ld ", regs->softe);
+       pr_cont("IRQMASK: %lx ", regs->softe);
 #endif
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
        if (MSR_TM_ACTIVE(regs->msr))

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index d94a41254b11ce50637baad75313042df1072963..0561c14b276b0d3da92d014bf465146c750bdf00 100644 (file)
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -1637,7 +1637,7 @@ static void excprint(struct pt_regs *fp)
 
        printf("  current = 0x%px\n", current);
 #ifdef CONFIG_PPC64
-       printf("  paca    = 0x%px\t softe: %d\t irq_happened: 0x%02x\n",
+       printf("  paca    = 0x%px\t irqmask: 0x%02x\t irq_happened: 0x%02x\n",
               local_paca, local_paca->irq_soft_mask, local_paca->irq_happened);
 #endif
        if (current) {