commit b8cfac4c2f3d12d0f4cbe6f992d945f2fdfc098d
author David S. Miller <davem@sunset.davemloft.net> Thu Jul 27 17:57:32 2006 -0700
committer David S. Miller <davem@sunset.davemloft.net> Thu Jul 27 17:57:32 2006 -0700
tree d6669a0427d76d8c59edeb08d6fe04f7caa79672
parent 92f282988b4ce3967ee8399f7d1184ebfa04e48b

[SPARC64]: Fix typo in pgprot_noncached().

The sun4v code sequence was or'ing in the sun4u pte bits by mistake.

Signed-off-by: David S. Miller <davem@davemloft.net>

include/asm-sparc64/pgtable.h

diff --git a/include/asm-sparc64/pgtable.h b/include/asm-sparc64/pgtable.h
index 03f5bc9..1ba19eb 100644
--- a/include/asm-sparc64/pgtable.h
+++ b/include/asm-sparc64/pgtable.h
@@ -339,7 +339,7 @@
 	"	.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),