---

yaml --- r: 313680 b: refs/heads/master c: 8bf8385 h: refs/heads/master v: v3
git-mirror · Jul 11, 2012 · 4c8ee3d · 4c8ee3d
1 parent 023ef0d
commit 4c8ee3d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9778b696a0188ad3b3524b383953ee73b31b7b68
+refs/heads/master: 8bf8385b9c3b7f6aaf892eb3141a5af0bbb2027e
diff --git a/trunk/arch/powerpc/kernel/entry_32.S b/trunk/arch/powerpc/kernel/entry_32.S
@@ -226,13 +226,7 @@ reenable_mmu:				/* re-enable mmu so we can */
 	stw	r3,16(r1)
 	stw	r4,20(r1)
 	stw	r5,24(r1)
-	andi.	r12,r12,MSR_PR
-	b	11f
 	bl	trace_hardirqs_off
-	b	12f
-11:
-	bl	trace_hardirqs_off
-12:
 	lwz	r5,24(r1)
 	lwz	r4,20(r1)
 	lwz	r3,16(r1)