aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-07-27 17:57:32 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-07-27 17:57:32 -0700
commitb8cfac4c2f3d12d0f4cbe6f992d945f2fdfc098d (patch)
treed6669a0427d76d8c59edeb08d6fe04f7caa79672 /include
parent92f282988b4ce3967ee8399f7d1184ebfa04e48b (diff)
downloadkernel_samsung_crespo-b8cfac4c2f3d12d0f4cbe6f992d945f2fdfc098d.zip
kernel_samsung_crespo-b8cfac4c2f3d12d0f4cbe6f992d945f2fdfc098d.tar.gz
kernel_samsung_crespo-b8cfac4c2f3d12d0f4cbe6f992d945f2fdfc098d.tar.bz2
[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>
Diffstat (limited to 'include')
-rw-r--r--include/asm-sparc64/pgtable.h2
1 files changed, 1 insertions, 1 deletions
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 @@ 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),