Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6d888d1ab0000dff8ea2901bcdf5d213f2a54e8b

Authored by Anton Blanchard
Committed by Benjamin Herrenschmidt
1 parent 84b073868b
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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@samba.org>
Acked-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

arch/powerpc/kernel/process.c
Diff comments   View file @ 6d888d1
... ... @@ -871,7 +871,8 @@
871 871 printk("SOFTE: %ld ", regs->softe);
872 872 #endif
873 873 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
874   - printk("\nPACATMSCRATCH: %016llx ", get_paca()->tm_scratch);
  874 + if (MSR_TM_ACTIVE(regs->msr))
  875 + printk("\nPACATMSCRATCH: %016llx ", get_paca()->tm_scratch);
875 876 #endif
876 877  
877 878 for (i = 0; i < 32; i++) {