From 0a34896c82ba58a703bd99908a639785bbbb8498 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 27 Jul 2006 17:57:32 -0700 Subject: [PATCH] --- yaml --- r: 32857 b: refs/heads/master c: b8cfac4c2f3d12d0f4cbe6f992d945f2fdfc098d h: refs/heads/master i: 32855: 262d77e460dbf66ba6b8201f44a299c002ba1bc5 v: v3 --- [refs] | 2 +- trunk/include/asm-sparc64/pgtable.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 61aa95d19bd2..8b681dc6737f 100644 --- 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 index 03f5bc9b6bec..1ba19eb34ce3 100644 --- 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),