[PATCH 11/11] - UML - fix definitions of pte_unmap_*

From: Jeff Dike
Date: Fri Nov 12 2004 - 19:00:38 EST


Some definitions of pte_unmap_* macros were written for HIGHPTE, which UML
doesn't support.

Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>

Index: 2.6.9/include/asm-um/pgtable.h
===================================================================
--- 2.6.9.orig/include/asm-um/pgtable.h 2004-11-12 13:26:04.000000000 -0500
+++ 2.6.9/include/asm-um/pgtable.h 2004-11-12 17:01:05.000000000 -0500
@@ -393,11 +393,10 @@
#define pte_offset_kernel(dir, address) \
((pte_t *) pmd_page_kernel(*(dir)) + pte_index(address))
#define pte_offset_map(dir, address) \
- ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE0) + pte_index(address))
-#define pte_offset_map_nested(dir, address) \
- ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE1) + pte_index(address))
-#define pte_unmap(pte) kunmap_atomic((pte), KM_PTE0)
-#define pte_unmap_nested(pte) kunmap_atomic((pte), KM_PTE1)
+ ((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address))
+#define pte_offset_map_nested(dir, address) pte_offset_map(dir, address)
+#define pte_unmap(pte) do { } while (0)
+#define pte_unmap_nested(pte) do { } while (0)

#define update_mmu_cache(vma,address,pte) do ; while (0)


-
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/