diff options
| author | Anton Blanchard <anton@samba.org> | 2013-11-18 13:19:17 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-11-21 10:33:40 +1100 |
| commit | 6d888d1ab0000dff8ea2901bcdf5d213f2a54e8b (patch) | |
| tree | 5bd05b9672587e5b1201dabdde4547d68b5747ff /arch/powerpc | |
| parent | 84b073868b9d9e754ae48b828337633d1b386482 (diff) | |
| download | linux-6d888d1ab0000dff8ea2901bcdf5d213f2a54e8b.tar.bz2 | |
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>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/process.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 373980ae52ad..6cd50ac12219 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++) { |