Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / include / asm-um / pgtable.h

diff --git a/include/asm-um/pgtable.h b/include/asm-um/pgtable.h
index 4862daf8b9068390c31e247d7fc2ed34dce7f9e7..1b1090a91a58f2954bfe5455edcc561e253cc83f 100644 (file)
--- a/include/asm-um/pgtable.h
+++ b/include/asm-um/pgtable.h
@@ -269,12 +269,6 @@ static inline pte_t pte_wrprotect(pte_t pte)
 }
 
 static inline pte_t pte_mkread(pte_t pte)
-{ 
-       pte_set_bits(pte, _PAGE_RW);
-       return(pte_mknewprot(pte)); 
-}
-
-static inline pte_t pte_mkexec(pte_t pte)
 { 
        pte_set_bits(pte, _PAGE_USER);
        return(pte_mknewprot(pte)); 
@@ -414,6 +408,15 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 
 #include <asm-generic/pgtable-nopud.h>
 
+#ifdef CONFIG_HIGHMEM
+/* Clear a kernel PTE and flush it from the TLB */
+#define kpte_clear_flush(ptep, vaddr)                                  \
+do {                                                                   \
+       pte_clear(&init_mm, vaddr, ptep);                               \
+       __flush_tlb_one(vaddr);                                         \
+} while (0)
+#endif
+
 #endif
 #endif