---

yaml --- r: 32857 b: refs/heads/master c: b8cfac4 h: refs/heads/master i: 32855: 262d77e v: v3
git-mirror · Jul 28, 2006 · 0a34896 · 0a34896
1 parent ebb3fe0
commit 0a34896
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92f282988b4ce3967ee8399f7d1184ebfa04e48b
+refs/heads/master: b8cfac4c2f3d12d0f4cbe6f992d945f2fdfc098d
diff --git a/trunk/include/asm-sparc64/pgtable.h b/trunk/include/asm-sparc64/pgtable.h
@@ -339,7 +339,7 @@ static inline pgprot_t pgprot_noncached(pgprot_t prot)
 	"	.section	.sun4v_2insn_patch, \"ax\"\n"
 	"	.word		661b\n"
 	"	andn		%0, %4, %0\n"
-	"	or		%0, %3, %0\n"
+	"	or		%0, %5, %0\n"
 	"	.previous\n"
 	: "=r" (val)
 	: "0" (val), "i" (_PAGE_CP_4U | _PAGE_CV_4U), "i" (_PAGE_E_4U),