Merge tag 'ceph-for-5.20-rc1' of https://github.com/ceph/ceph-client

[linux-block.git] / drivers / virtio / virtio_mem.c

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;
 
        /*