From 4c8ee3d64bb17331c6186e672e4dcb574da783b2 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sun, 1 Jul 2012 18:47:17 +0000
Subject: [PATCH] --- yaml --- r: 313680 b: refs/heads/master c:
 8bf8385b9c3b7f6aaf892eb3141a5af0bbb2027e h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/powerpc/kernel/entry_32.S | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2ac74e3b87a2..bb41b0125836 100644
--- 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
index bad42e3d27a9..5207d5a405e2 100644
--- 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)