2 files changed, 12 insertions, 2 deletions

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index fc00c8cb5a82..89b9075f8c11 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1295,8 +1295,13 @@ int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
          * Avoid grouping on DSO/COW pages in specific and RO pages
          * in general, RO pages shouldn't hurt as much anyway since
          * they can be in shared cache state.
+         *
+         * FIXME! This checks "pmd_dirty()" as an approximation of
+         * "is this a read-only page", since checking "pmd_write()"
+         * is even more broken. We haven't actually turned this into
+         * a writable page, so pmd_write() will always be false.
          */
-        if (!pmd_write(pmd))
+        if (!pmd_dirty(pmd))
                 flags |= TNF_NO_GROUP;
 
         /*
diff --git a/mm/memory.c b/mm/memory.c
index 8068893697bb..411144f977b1 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3072,8 +3072,13 @@ static int do_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
          * Avoid grouping on DSO/COW pages in specific and RO pages
          * in general, RO pages shouldn't hurt as much anyway since
          * they can be in shared cache state.
+         *
+         * FIXME! This checks "pmd_dirty()" as an approximation of
+         * "is this a read-only page", since checking "pmd_write()"
+         * is even more broken. We haven't actually turned this into
+         * a writable page, so pmd_write() will always be false.
          */
-        if (!pte_write(pte))
+        if (!pte_dirty(pte))
                 flags |= TNF_NO_GROUP;
 
         /*