powerpc: Only print PACATMSCRATCH in oops when TM is active

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=6d888d1ab0000dff8ea2901bcdf5d213f2a54e8b
Commit:     6d888d1ab0000dff8ea2901bcdf5d213f2a54e8b
Parent:     84b073868b9d9e754ae48b828337633d1b386482
Author:     Anton Blanchard <anton at samba.org>
AuthorDate: Mon Nov 18 13:19:17 2013 +1100
Committer:  Benjamin Herrenschmidt <benh at kernel.crashing.org>
CommitDate: Thu Nov 21 10:33:40 2013 +1100

    powerpc: Only print PACATMSCRATCH in oops when TM is active
    
    If TM is not active there is no need to print PACATMSCRATCH
    so we can save ourselves a line.
    
    Signed-off-by: Anton Blanchard <anton at samba.org>
    Acked-by: Michael Neuling <mikey at neuling.org>
    Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
---
 arch/powerpc/kernel/process.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 373980a..6cd50ac 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -871,7 +871,8 @@ void show_regs(struct pt_regs * regs)
 	printk("SOFTE: %ld ", regs->softe);
 #endif
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
-	printk("\nPACATMSCRATCH: %016llx ", get_paca()->tm_scratch);
+	if (MSR_TM_ACTIVE(regs->msr))
+		printk("\nPACATMSCRATCH: %016llx ", get_paca()->tm_scratch);
 #endif
 
 	for (i = 0;  i < 32;  i++) {