|
@@ -858,17 +858,21 @@ void show_regs(struct pt_regs * regs)
|
|
|
printk("MSR: "REG" ", regs->msr);
|
|
|
printbits(regs->msr, msr_bits);
|
|
|
printk(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer);
|
|
|
-#ifdef CONFIG_PPC64
|
|
|
- printk("SOFTE: %ld\n", regs->softe);
|
|
|
-#endif
|
|
|
trap = TRAP(regs);
|
|
|
if ((regs->trap != 0xc00) && cpu_has_feature(CPU_FTR_CFAR))
|
|
|
- printk("CFAR: "REG"\n", regs->orig_gpr3);
|
|
|
- if (trap == 0x300 || trap == 0x600)
|
|
|
+ printk("CFAR: "REG" ", regs->orig_gpr3);
|
|
|
+ if (trap == 0x200 || trap == 0x300 || trap == 0x600)
|
|
|
#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
|
|
|
- printk("DEAR: "REG", ESR: "REG"\n", regs->dar, regs->dsisr);
|
|
|
+ printk("DEAR: "REG" ESR: "REG" ", regs->dar, regs->dsisr);
|
|
|
#else
|
|
|
- printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
|
|
|
+ printk("DAR: "REG" DSISR: %08lx ", regs->dar, regs->dsisr);
|
|
|
+#endif
|
|
|
+#ifdef CONFIG_PPC64
|
|
|
+ printk("SOFTE: %ld ", regs->softe);
|
|
|
+#endif
|
|
|
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
|
|
|
+ if (MSR_TM_ACTIVE(regs->msr))
|
|
|
+ printk("\nPACATMSCRATCH: %016llx ", get_paca()->tm_scratch);
|
|
|
#endif
|
|
|
|
|
|
for (i = 0; i < 32; i++) {
|
|
@@ -886,9 +890,6 @@ void show_regs(struct pt_regs * regs)
|
|
|
*/
|
|
|
printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
|
|
|
printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
|
|
|
-#endif
|
|
|
-#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
|
|
|
- printk("PACATMSCRATCH [%llx]\n", get_paca()->tm_scratch);
|
|
|
#endif
|
|
|
show_stack(current, (unsigned long *) regs->gpr[1]);
|
|
|
if (!user_mode(regs))
|