---

yaml --- r: 101775 b: refs/heads/master c: 801eb73 h: refs/heads/master i: 101773: 28d82f6 101771: b1e1057 101767: cd3aae2 101759: 6e09871 v: v3
git-mirror · Jul 9, 2008 · efbbbe7 · efbbbe7
1 parent 29e390d
commit efbbbe7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef3d3246a0d06be622867d21af25f997aeeb105f
+refs/heads/master: 801eb73f45371accc78ca9d6d22d647eeb722c11
diff --git a/trunk/arch/powerpc/platforms/pseries/lpar.c b/trunk/arch/powerpc/platforms/pseries/lpar.c
@@ -305,7 +305,8 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
 	flags = 0;
 
 	/* Make pHyp happy */
-	if (rflags & (_PAGE_GUARDED|_PAGE_NO_CACHE))
+	if ((rflags & _PAGE_GUARDED) ||
+	    ((rflags & _PAGE_NO_CACHE) & !(rflags & _PAGE_WRITETHRU)))
 		hpte_r &= ~_PAGE_COHERENT;
 
 	lpar_rc = plpar_pte_enter(flags, hpte_group, hpte_v, hpte_r, &slot);