---

yaml --- r: 27127 b: refs/heads/master c: 79e0bc3 h: refs/heads/master i: 27125: 9a67a5d 27123: 3271c25 27119: cb876f2 v: v3
git-mirror · Jun 5, 2006 · 22b087d · 22b087d
1 parent f00baef
commit 22b087d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;
 }