From d01da341c8baa7aa148e37852143d71e913ffe99 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Wed, 17 Oct 2007 18:04:33 +0200
Subject: [PATCH] --- yaml --- r: 70950 b: refs/heads/master c:
 aa506dc7b12d03fbf8fd11aab752aed1aadd9c07 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/mm/pgtable_32.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4b5c51d4c63f..6920d4663359 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d72b1b4f41b5159d2d0e54e54c794d500197572e
+refs/heads/master: aa506dc7b12d03fbf8fd11aab752aed1aadd9c07
diff --git a/trunk/arch/x86/mm/pgtable_32.c b/trunk/arch/x86/mm/pgtable_32.c
index ef1f6cd3ea66..bbaa2b153934 100644
--- a/trunk/arch/x86/mm/pgtable_32.c
+++ b/trunk/arch/x86/mm/pgtable_32.c
@@ -97,8 +97,7 @@ static void set_pte_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags)
 	}
 	pte = pte_offset_kernel(pmd, vaddr);
 	if (pgprot_val(flags))
-		/* <pfn,flags> stored as-is, to permit clearing entries */
-		set_pte(pte, pfn_pte(pfn, flags));
+		set_pte_present(&init_mm, vaddr, pte, pfn_pte(pfn, flags));
 	else
 		pte_clear(&init_mm, vaddr, pte);