---

yaml --- r: 43087 b: refs/heads/master c: b0bfece h: refs/heads/master i: 43085: d8179af 43083: d8686e7 43079: 9aaff87 43071: bfe9453 v: v3
git-mirror · Dec 7, 2006 · ec3b426 · ec3b426
1 parent a56df3e
commit ec3b426
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a457324229db34d3bcb0b67360130c287289401
+refs/heads/master: b0bfece40b1988aa8e3d910938691dce7859d82d
diff --git a/trunk/arch/i386/mm/pgtable.c b/trunk/arch/i386/mm/pgtable.c
@@ -95,8 +95,11 @@ static void set_pte_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags)
 		return;
 	}
 	pte = pte_offset_kernel(pmd, vaddr);
-	/* <pfn,flags> stored as-is, to permit clearing entries */
-	set_pte(pte, pfn_pte(pfn, flags));
+	if (pgprot_val(flags))
+		/* <pfn,flags> stored as-is, to permit clearing entries */
+		set_pte(pte, pfn_pte(pfn, flags));
+	else
+		pte_clear(&init_mm, vaddr, pte);
 
 	/*
 	 * It's enough to flush this one mapping.