UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Kefeng Wang 2022-07-26 21:11:35 +08:00 committed by akpm
parent 1168076345
commit 07252dfea2
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/virtio/virtio_mem.c
View File

@ -862,8 +862,7 @@ static void virtio_mem_sbm_notify_online(struct virtio_mem *vm,
unsigned long mb_id, unsigned long mb_id,
unsigned long start_pfn) unsigned long start_pfn)
{ {
const bool is_movable = page_zonenum(pfn_to_page(start_pfn)) == const bool is_movable = is_zone_movable_page(pfn_to_page(start_pfn));
ZONE_MOVABLE;
int new_state; int new_state;
switch (virtio_mem_sbm_get_mb_state(vm, mb_id)) { 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) static int virtio_mem_fake_offline(unsigned long pfn, unsigned long nr_pages)
{ {
const bool is_movable = page_zonenum(pfn_to_page(pfn)) == const bool is_movable = is_zone_movable_page(pfn_to_page(pfn));
ZONE_MOVABLE;
int rc, retry_count; int rc, retry_count;
/* /*

2
mm/memory_hotplug.c
View File

@ -932,7 +932,7 @@ static struct zone *auto_movable_zone_for_pfn(int nid,
if (!page) if (!page)
continue; continue;
/* If anything is !MOVABLE online the rest !MOVABLE. */ /* If anything is !MOVABLE online the rest !MOVABLE. */
if (page_zonenum(page) != ZONE_MOVABLE) if (!is_zone_movable_page(page))
goto kernel_zone; goto kernel_zone;
online_pages += PAGES_PER_SECTION; online_pages += PAGES_PER_SECTION;
} }