From 19ce15ea0aeae69f3b42185fc7dbcee1ca80682d Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 16 Mar 2012 09:26:59 +1100
Subject: [PATCH] --- yaml --- r: 292536 b: refs/heads/master c:
 01e8ec4417d3c484986af0adaa0ae6632e0a59cd h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/powerpc/kernel/idle_power4.S | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ea571f4b16db..57b767e94def 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d3d897a4697e4ff746e5e82f116b2346ed28150
+refs/heads/master: 01e8ec4417d3c484986af0adaa0ae6632e0a59cd
diff --git a/trunk/arch/powerpc/kernel/idle_power4.S b/trunk/arch/powerpc/kernel/idle_power4.S
index d8cdba4c28b2..2c71b0fc9f91 100644
--- a/trunk/arch/powerpc/kernel/idle_power4.S
+++ b/trunk/arch/powerpc/kernel/idle_power4.S
@@ -50,9 +50,9 @@ END_FTR_SECTION_IFCLR(CPU_FTR_CAN_NAP)
 	addi    r1,r1,128
 	ld	r0,16(r1)
 	mtlr	r0
+	mfmsr	r7
 #endif /* CONFIG_TRACE_IRQFLAGS */
 
-	TRACE_ENABLE_INTS
 	li	r0,1
 	stb	r0,PACASOFTIRQEN(r13)	/* we'll hard-enable shortly */
 BEGIN_FTR_SECTION