Browse Source

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>
Nicholas Piggin 7 years ago
parent
commit
3130a7bb6e
2 changed files with 2 additions and 2 deletions
  1. 1 1
      arch/powerpc/kernel/process.c
  2. 1 1
      arch/powerpc/xmon/xmon.c

+ 1 - 1
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);
 		pr_cont("DAR: "REG" DSISR: %08lx ", regs->dar, regs->dsisr);
 #endif
 #endif
 #ifdef CONFIG_PPC64
 #ifdef CONFIG_PPC64
-	pr_cont("SOFTE: %ld ", regs->softe);
+	pr_cont("IRQMASK: %lx ", regs->softe);
 #endif
 #endif
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
 	if (MSR_TM_ACTIVE(regs->msr))
 	if (MSR_TM_ACTIVE(regs->msr))

+ 1 - 1
arch/powerpc/xmon/xmon.c

@@ -1637,7 +1637,7 @@ static void excprint(struct pt_regs *fp)
 
 
 	printf("  current = 0x%px\n", current);
 	printf("  current = 0x%px\n", current);
 #ifdef CONFIG_PPC64
 #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);
 	       local_paca, local_paca->irq_soft_mask, local_paca->irq_happened);
 #endif
 #endif
 	if (current) {
 	if (current) {