lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: Fix power4/970 idle code regression with lockdep

Browse Source 
in commit 7230c56441
"powerpc: Rework lazy-interrupt handling"

I introduced a regression, accidentally calling irq tracing twice
and not properly restoring a clobbered register (r7) later used
for writing to the MSR.

This caused lockups when booting on a G5 with lockdep enabled.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Benjamin Herrenschmidt
2012-03-16 09:26:59 +11:00
parent 7d3d897a46
commit 01e8ec4417
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/idle_power4.S
View File

@@ -50,9 +50,9 @@ END_FTR_SECTION_IFCLR(CPU_FTR_CAN_NAP)
addi r1,r1,128 addi r1,r1,128
ld r0,16(r1) ld r0,16(r1)
mtlr r0 mtlr r0
mfmsr r7
#endif /* CONFIG_TRACE_IRQFLAGS */ #endif /* CONFIG_TRACE_IRQFLAGS */
TRACE_ENABLE_INTS
li r0,1 li r0,1
stb r0,PACASOFTIRQEN(r13) /* we'll hard-enable shortly */ stb r0,PACASOFTIRQEN(r13) /* we'll hard-enable shortly */
BEGIN_FTR_SECTION BEGIN_FTR_SECTION