Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3130a7bb authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

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: default avatarNicholas Piggin <npiggin@gmail.com>
Acked-by: default avatarBalbir Singh <bsingharora@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 81ea11d3

arch/powerpc/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -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))

arch/powerpc/xmon/xmon.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {