[PATCH] i386/PAE: avoid temporarily inconsistent pte-s

[Jan Beulich]

One more of these issues (which were considered fixed a few releases
back): Other than on x86-64, i386 allows set_fixmap() to replace
already present mappings. Consequently, on PAE, care must be taken to
not update the high half of a pte while the low half is still holding
the old value.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

 arch/i386/mm/pgtable.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- linux-2.6.23-rc6/arch/i386/mm/pgtable.c	2007-09-14 17:38:47.000000000 +0200
+++ 2.6.23-rc6-i386-set-fixmap/arch/i386/mm/pgtable.c	2007-09-19 10:49:53.000000000 +0200
@@ -97,8 +97,7 @@ static void set_pte_pfn(unsigned long va
 	}
 	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);
 



-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/