mm: use is_zone_movable_page() helper

Use is_zone_movable_page() helper to simplify code.

Link: https://lkml.kernel.org/r/20220726131135.146912-1-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Pankaj Gupta <pankaj.gupta@amd.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c
index e07486f019992672ae5b7a50a0bbf340cb8cb542..0c2892ec68171d18e1578f3382922372d9b242fd 100644 (file)
--- a/drivers/virtio/virtio_mem.c
+++ b/drivers/virtio/virtio_mem.c
@@ -862,8 +862,7 @@ static void virtio_mem_sbm_notify_online(struct virtio_mem *vm,
                                         unsigned long mb_id,
                                         unsigned long start_pfn)
 {
-       const bool is_movable = page_zonenum(pfn_to_page(start_pfn)) ==
-                               ZONE_MOVABLE;
+       const bool is_movable = is_zone_movable_page(pfn_to_page(start_pfn));
        int new_state;
 
        switch (virtio_mem_sbm_get_mb_state(vm, mb_id)) {
@@ -1158,8 +1157,7 @@ static void virtio_mem_fake_online(unsigned long pfn, unsigned long nr_pages)
  */
 static int virtio_mem_fake_offline(unsigned long pfn, unsigned long nr_pages)
 {
-       const bool is_movable = page_zonenum(pfn_to_page(pfn)) ==
-                               ZONE_MOVABLE;
+       const bool is_movable = is_zone_movable_page(pfn_to_page(pfn));
        int rc, retry_count;
 
        /*

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 99ecb2b3ff53e3792649c85402cfa05e572c82ff..fad6d1f2262af652d30e40e344cb225ebf991d19 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -932,7 +932,7 @@ static struct zone *auto_movable_zone_for_pfn(int nid,
                        if (!page)
                                continue;
                        /* If anything is !MOVABLE online the rest !MOVABLE. */
-                       if (page_zonenum(page) != ZONE_MOVABLE)
+                       if (!is_zone_movable_page(page))
                                goto kernel_zone;
                        online_pages += PAGES_PER_SECTION;
                }