From 793d92d2ada487b589662cef09a8299fef467cc3 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Date: Wed, 19 Aug 2009 04:27:53 +0000
Subject: [PATCH] --- yaml --- r: 161755 b: refs/heads/master c:
 14d757520a08d09745c3b18bb34addd9bef56e2d h: refs/heads/master i:   161753:
 7f61f2c6999dbcbff36f2d1bfe9c8b1db5b84540   161751:
 39b1844c203cb57d9417b3dfcd00f6c5c65a1e16 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/powerpc/kernel/misc_32.S | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 21a83afc9988..3d219a063d53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea3cc330ac0cd521ff07c7cd432a1848c19a7e92
+refs/heads/master: 14d757520a08d09745c3b18bb34addd9bef56e2d
diff --git a/trunk/arch/powerpc/kernel/misc_32.S b/trunk/arch/powerpc/kernel/misc_32.S
index 15f28e0de78d..da9c0c4c10f3 100644
--- a/trunk/arch/powerpc/kernel/misc_32.S
+++ b/trunk/arch/powerpc/kernel/misc_32.S
@@ -342,10 +342,17 @@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE)
 	addi	r3,r3,L1_CACHE_BYTES
 	bdnz	1b
 	sync				/* wait for dcbst's to get to ram */
+#ifndef CONFIG_44x
 	mtctr	r4
 2:	icbi	0,r6
 	addi	r6,r6,L1_CACHE_BYTES
 	bdnz	2b
+#else
+	/* Flash invalidate on 44x because we are passed kmapped addresses and
+	   this doesn't work for userspace pages due to the virtually tagged
+	   icache.  Sigh. */
+	iccci	0, r0
+#endif
 	sync				/* additional sync needed on g4 */
 	isync
 	blr