Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc: Fix power4/970 idle code regression with lockdep

in commit 7230c5644188cd9e3fb380cc97dde00c464a3ba7
"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>

+1 -1
+1 -1
arch/powerpc/kernel/idle_power4.S
··· 50 50 addi r1,r1,128 51 51 ld r0,16(r1) 52 52 mtlr r0 53 + mfmsr r7 53 54 #endif /* CONFIG_TRACE_IRQFLAGS */ 54 55 55 - TRACE_ENABLE_INTS 56 56 li r0,1 57 57 stb r0,PACASOFTIRQEN(r13) /* we'll hard-enable shortly */ 58 58 BEGIN_FTR_SECTION