---

yaml --- r: 292536 b: refs/heads/master c: 01e8ec4 h: refs/heads/master v: v3
git-mirror · Mar 15, 2012 · 19ce15e · 19ce15e
1 parent dba2668
commit 19ce15e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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