Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[linux-2.6] / include / asm-i386 / pgtable.h

diff --git a/include/asm-i386/pgtable.h b/include/asm-i386/pgtable.h
index 995e8b34efd0f77e3ab71a6e7866f9bc1bddd317..edce9d51a676cd4822c09c21b0663801d52e03e3 100644 (file)
--- a/include/asm-i386/pgtable.h
+++ b/include/asm-i386/pgtable.h
@@ -243,8 +243,6 @@ static inline pte_t pte_mkyoung(pte_t pte)  { (pte).pte_low |= _PAGE_ACCESSED; re
 static inline pte_t pte_mkwrite(pte_t pte)     { (pte).pte_low |= _PAGE_RW; return pte; }
 static inline pte_t pte_mkhuge(pte_t pte)      { (pte).pte_low |= _PAGE_PSE; return pte; }
 
-extern void vmalloc_sync_all(void);
-
 #ifdef CONFIG_X86_PAE
 # include <asm/pgtable-3level.h>
 #else
@@ -297,22 +295,24 @@ do {                                                                      \
 } while (0)
 
 #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY
-static inline int ptep_test_and_clear_dirty(struct vm_area_struct *vma,
-                                           unsigned long addr, pte_t *ptep)
-{
-       if (!pte_dirty(*ptep))
-               return 0;
-       return test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte_low);
-}
+#define ptep_test_and_clear_dirty(vma, addr, ptep) ({                  \
+       int ret = 0;                                                    \
+       if (pte_dirty(*ptep))                                           \
+               ret = test_and_clear_bit(_PAGE_BIT_DIRTY, &ptep->pte_low); \
+       if (ret)                                                        \
+               pte_update_defer(vma->vm_mm, addr, ptep);               \
+       ret;                                                            \
+})
 
 #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
-static inline int ptep_test_and_clear_young(struct vm_area_struct *vma,
-                                           unsigned long addr, pte_t *ptep)
-{
-       if (!pte_young(*ptep))
-               return 0;
-       return test_and_clear_bit(_PAGE_BIT_ACCESSED, &ptep->pte_low);
-}
+#define ptep_test_and_clear_young(vma, addr, ptep) ({                  \
+       int ret = 0;                                                    \
+       if (pte_young(*ptep))                                           \
+               ret = test_and_clear_bit(_PAGE_BIT_ACCESSED, &ptep->pte_low); \
+       if (ret)                                                        \
+               pte_update_defer(vma->vm_mm, addr, ptep);               \
+       ret;                                                            \
+})
 
 /*
  * Rules for using ptep_establish: the pte MUST be a user pte, and
@@ -330,10 +330,8 @@ do {                                                                       \
 ({                                                                     \
        int __dirty;                                                    \
        __dirty = ptep_test_and_clear_dirty((vma), (address), (ptep));  \
-       if (__dirty) {                                                  \
-               pte_update_defer((vma)->vm_mm, (address), (ptep));      \
+       if (__dirty)                                                    \
                flush_tlb_page(vma, address);                           \
-       }                                                               \
        __dirty;                                                        \
 })
 
@@ -342,10 +340,8 @@ do {                                                                       \
 ({                                                                     \
        int __young;                                                    \
        __young = ptep_test_and_clear_young((vma), (address), (ptep));  \
-       if (__young) {                                                  \
-               pte_update_defer((vma)->vm_mm, (address), (ptep));      \
+       if (__young)                                                    \
                flush_tlb_page(vma, address);                           \
-       }                                                               \
        __young;                                                        \
 })
 
@@ -546,10 +542,6 @@ static inline void paravirt_pagetable_setup_done(pgd_t *base)
 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot)                \
                remap_pfn_range(vma, vaddr, pfn, size, prot)
 
-#define MK_IOSPACE_PFN(space, pfn)     (pfn)
-#define GET_IOSPACE(pfn)               0
-#define GET_PFN(pfn)                   (pfn)
-
 #include <asm-generic/pgtable.h>
 
 #endif /* _I386_PGTABLE_H */