From 606bbfb90ad897baec04afefd50d7db343e7448c Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon, 31 Mar 2008 07:49:27 +1100
Subject: [PATCH] --- yaml --- r: 88121 b: refs/heads/master c:
 b991f05f1326fd9e6212851d0f2099875906dd16 h: refs/heads/master i:   88119:
 044100a4dc0724e9e28e7e6278e7a03ffcb67ac4 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/powerpc/mm/hash_low_32.S | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5f6e6d8a4d6f..8beee3375cfd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff3da2e0938bae36d10d69c22bce0177b067a9e2
+refs/heads/master: b991f05f1326fd9e6212851d0f2099875906dd16
diff --git a/trunk/arch/powerpc/mm/hash_low_32.S b/trunk/arch/powerpc/mm/hash_low_32.S
index 7f830a4888d6..e10d76a860d3 100644
--- a/trunk/arch/powerpc/mm/hash_low_32.S
+++ b/trunk/arch/powerpc/mm/hash_low_32.S
@@ -44,6 +44,9 @@ mmu_hash_lock:
 #ifdef CONFIG_SMP
 	.text
 _GLOBAL(hash_page_sync)
+	mfmsr   r10
+	rlwinm  r0,r10,0,17,15          /* clear bit 16 (MSR_EE) */
+	mtmsr   r0
 	lis	r8,mmu_hash_lock@h
 	ori	r8,r8,mmu_hash_lock@l
 	lis	r0,0x0fff
@@ -60,8 +63,9 @@ _GLOBAL(hash_page_sync)
 	eieio
 	li	r0,0
 	stw	r0,0(r8)
-	blr	
-#endif
+	mtmsr	r10
+	blr
+#endif /* CONFIG_SMP */
 
 /*
  * Load a PTE into the hash table, if possible.