Purge existing TLB entries in set_pte_at and ptep_set_wrprotect

[pandora-kernel.git] / arch / parisc / include / asm / pgtable.h

diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
index 22dadeb..9d35a3e 100644 (file)
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
@@ -12,11 +12,10 @@
 
 #include <linux/bitops.h>
 #include <linux/spinlock.h>
+#include <linux/mm_types.h>
 #include <asm/processor.h>
 #include <asm/cache.h>
 
-struct vm_area_struct;
-
 /*
  * kern_addr_valid(ADDR) tests if ADDR is pointing to valid kernel
  * memory.  For the return value to be meaningful, ADDR must be >=
@@ -40,7 +39,14 @@ struct vm_area_struct;
         do{                                                     \
                 *(pteptr) = (pteval);                           \
         } while(0)
-#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
+
+extern void purge_tlb_entries(struct mm_struct *, unsigned long);
+
+#define set_pte_at(mm, addr, ptep, pteval)                      \
+       do {                                                    \
+               set_pte(ptep, pteval);                          \
+               purge_tlb_entries(mm, addr);                    \
+       } while (0)
 
 #endif /* !__ASSEMBLY__ */
 
@@ -464,6 +470,7 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
                old = pte_val(*ptep);
                new = pte_val(pte_wrprotect(__pte (old)));
        } while (cmpxchg((unsigned long *) ptep, old, new) != old);
+       purge_tlb_entries(mm, addr);
 #else
        pte_t old_pte = *ptep;
        set_pte_at(mm, addr, ptep, pte_wrprotect(old_pte));