mm/swapops: rework swap entry manipulation code

[sfrench/cifs-2.6.git] / mm / mprotect.c

diff --git a/mm/mprotect.c b/mm/mprotect.c
index e7a443157988dffb8f351070ad6ced89a3e42b76..ee5961888e7075bdfdbe606a6df6efbfeb23b194 100644 (file)
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -143,23 +143,25 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
                        swp_entry_t entry = pte_to_swp_entry(oldpte);
                        pte_t newpte;
 
-                       if (is_write_migration_entry(entry)) {
+                       if (is_writable_migration_entry(entry)) {
                                /*
                                 * A protection check is difficult so
                                 * just be safe and disable write
                                 */
-                               make_migration_entry_read(&entry);
+                               entry = make_readable_migration_entry(
+                                                       swp_offset(entry));
                                newpte = swp_entry_to_pte(entry);
                                if (pte_swp_soft_dirty(oldpte))
                                        newpte = pte_swp_mksoft_dirty(newpte);
                                if (pte_swp_uffd_wp(oldpte))
                                        newpte = pte_swp_mkuffd_wp(newpte);
-                       } else if (is_write_device_private_entry(entry)) {
+                       } else if (is_writable_device_private_entry(entry)) {
                                /*
                                 * We do not preserve soft-dirtiness. See
                                 * copy_one_pte() for explanation.
                                 */
-                               make_device_private_entry_read(&entry);
+                               entry = make_readable_device_private_entry(
+                                                       swp_offset(entry));
                                newpte = swp_entry_to_pte(entry);
                                if (pte_swp_uffd_wp(oldpte))
                                        newpte = pte_swp_mkuffd_wp(newpte);