1 files changed, 19 insertions, 15 deletions

diff --git a/include/asm-i386/pgtable.h b/include/asm-i386/pgtable.h
index 2394589786ba..628fa7747d0c 100644
--- a/include/asm-i386/pgtable.h
+++ b/include/asm-i386/pgtable.h
@@ -285,32 +285,36 @@ static inline pte_t native_local_ptep_get_and_clear(pte_t *ptep)
  */
 #define  __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
 #define ptep_set_access_flags(vma, address, ptep, entry, dirty)         \
-do {                                                                    \
-        if (dirty) {                                                    \
+({                                                                      \
+        int __changed = !pte_same(*(ptep), entry);                      \
+        if (__changed && dirty) {                                       \
                 (ptep)->pte_low = (entry).pte_low;                      \
                 pte_update_defer((vma)->vm_mm, (address), (ptep));      \
                 flush_tlb_page(vma, address);                           \
         }                                                               \
-} while (0)
+        __changed;                                                      \
+})
 
 #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY
 #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;                                                            \
+        int __ret = 0;                                                  \
+        if (pte_dirty(*(ptep)))                                         \
+                __ret = test_and_clear_bit(_PAGE_BIT_DIRTY,             \
+                                                &(ptep)->pte_low);      \
+        if (__ret)                                                      \
+                pte_update((vma)->vm_mm, addr, ptep);                   \
+        __ret;                                                          \
 })
 
 #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
 #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;                                                            \
+        int __ret = 0;                                                  \
+        if (pte_young(*(ptep)))                                         \
+                __ret = test_and_clear_bit(_PAGE_BIT_ACCESSED,          \
+                                                &(ptep)->pte_low);      \
+        if (__ret)                                                      \
+                pte_update((vma)->vm_mm, addr, ptep);                   \
+        __ret;                                                          \
 })
 
 /*