The patch titled Subject: mm/memory_hotplug: use helper zone_is_zone_device() to simplify the code has been added to the -mm tree. Its filename is mm-memory_hotplug-use-helper-zone_is_zone_device-to-simplify-the-code.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-memory_hotplug-use-helper-zone_is_zone_device-to-simplify-the-code.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-memory_hotplug-use-helper-zone_is_zone_device-to-simplify-the-code.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Miaohe Lin <linmiaohe@xxxxxxxxxx> Subject: mm/memory_hotplug: use helper zone_is_zone_device() to simplify the code Patch series "Cleanup and fixups for memory hotplug". This series contains cleanup to use helper function to simplify the code. Also we fix some potential bugs. More details can be found in the respective changelogs. This patch (of 3): Use helper zone_is_zone_device() to simplify the code and remove some explicit CONFIG_ZONE_DEVICE codes. Link: https://lkml.kernel.org/r/20210821094246.10149-1-linmiaohe@xxxxxxxxxx Link: https://lkml.kernel.org/r/20210821094246.10149-2-linmiaohe@xxxxxxxxxx Signed-off-by: Miaohe Lin <linmiaohe@xxxxxxxxxx> Cc: Naoya Horiguchi <naoya.horiguchi@xxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxx> Cc: Minchan Kim <minchan@xxxxxxxxxx> Cc: Chris Goldsworthy <cgoldswo@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory_hotplug.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/mm/memory_hotplug.c~mm-memory_hotplug-use-helper-zone_is_zone_device-to-simplify-the-code +++ a/mm/memory_hotplug.c @@ -477,15 +477,13 @@ void __ref remove_pfn_range_from_zone(st sizeof(struct page) * cur_nr_pages); } -#ifdef CONFIG_ZONE_DEVICE /* * Zone shrinking code cannot properly deal with ZONE_DEVICE. So * we will not try to shrink the zones - which is okay as * set_zone_contiguous() cannot deal with ZONE_DEVICE either way. */ - if (zone_idx(zone) == ZONE_DEVICE) + if (zone_is_zone_device(zone)) return; -#endif clear_zone_contiguous(zone); _ Patches currently in -mm which might be from linmiaohe@xxxxxxxxxx are mm-gup-remove-set-but-unused-local-variable-major.patch mm-gup-remove-unneed-local-variable-orig_refs.patch mm-gup-remove-useless-bug_on-in-__get_user_pages.patch mm-gup-fix-potential-pgmap-refcnt-leak-in-__gup_device_huge.patch mm-gup-use-helper-page_aligned-in-populate_vma_page_range.patch shmem-remove-unneeded-variable-ret.patch shmem-remove-unneeded-header-file.patch shmem-remove-unneeded-function-forward-declaration.patch shmem-include-header-file-to-declare-swap_info.patch mm-memcg-remove-unused-functions.patch mm-memcg-save-some-atomic-ops-when-flush-is-already-true.patch mm-hwpoison-remove-unneeded-variable-unmap_success.patch mm-hwpoison-fix-potential-pte_unmap_unlock-pte-error.patch mm-hwpoison-change-argument-struct-page-hpagep-to-hpage.patch mm-hwpoison-fix-some-obsolete-comments.patch mm-vmscan-remove-the-pagedirty-check-after-madv_free-pages-are-page_ref_freezed.patch mm-vmscan-remove-misleading-setting-to-sc-priority.patch mm-vmscan-remove-unneeded-return-value-of-kswapd_run.patch mm-vmscan-add-else-to-remove-check_pending-label.patch mm-vmstat-correct-some-wrong-comments.patch mm-vmstat-simplify-the-array-size-calculation.patch mm-vmstat-remove-unneeded-return-value.patch mm-memory_hotplug-use-helper-zone_is_zone_device-to-simplify-the-code.patch mm-memory_hotplug-fix-potential-permanent-lru-cache-disable.patch mm-memory_hotplug-make-hwpoisoned-dirty-swapcache-pages-unmovable.patch mm-zsmallocc-close-race-window-between-zs_pool_dec_isolated-and-zs_unregister_migration.patch mm-zsmallocc-combine-two-atomic-ops-in-zs_pool_dec_isolated.patch