From 22b087de7160caec009a1e1807c56c4132058936 Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Wed, 3 May 2006 22:56:43 +0400 Subject: [PATCH] --- yaml --- r: 27127 b: refs/heads/master c: 79e0bc37255a4b934291b4d3ea5a4561fbd78da4 h: refs/heads/master i: 27125: 9a67a5d1c5b17b671d8353bf65f9ed5a60d5beca 27123: 3271c25cb5ccac1604fdb97c97c83fa9ffb356d4 27119: cb876f26e379e91576deb9e688189951800efebe v: v3 --- [refs] | 2 +- trunk/include/asm-mips/pgtable.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bb1350bc4926..29c3950662c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9370b35175ca43fad7d24bc7b391473f3becbee8 +refs/heads/master: 79e0bc37255a4b934291b4d3ea5a4561fbd78da4 diff --git a/trunk/include/asm-mips/pgtable.h b/trunk/include/asm-mips/pgtable.h index f80fe75c7800..d0af2a3b0152 100644 --- a/trunk/include/asm-mips/pgtable.h +++ b/trunk/include/asm-mips/pgtable.h @@ -353,8 +353,9 @@ static inline pgprot_t pgprot_noncached(pgprot_t _prot) #if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32_R1) static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) { - pte.pte_low &= _PAGE_CHG_MASK; - pte.pte_low |= pgprot_val(newprot); + pte.pte_low &= _PAGE_CHG_MASK; + pte.pte_high &= ~0x3f; + pte.pte_low |= pgprot_val(newprot); pte.pte_high |= pgprot_val(newprot) & 0x3f; return pte; }