From: Miaohe Lin Date: Tue, 22 Mar 2022 21:47:24 +0000 (-0700) Subject: mm/memory_hotplug: fix misplaced comment in offline_pages X-Git-Tag: v5.18-rc1~168^2~52 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36ba30bc1df252ed65b8cae514b514985a7593c9;p=thirdparty%2Fkernel%2Flinux.git mm/memory_hotplug: fix misplaced comment in offline_pages It's misplaced since commit 7960509329c2 ("mm, memory_hotplug: print reason for the offlining failure"). Move it to the right place. Link: https://lkml.kernel.org/r/20220207133643.23427-5-linmiaohe@huawei.com Signed-off-by: Miaohe Lin Reviewed-by: David Hildenbrand Reviewed-by: Oscar Salvador Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index bb1893f10f0f4..ce68098832aa9 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1963,6 +1963,7 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages, return 0; failed_removal_isolated: + /* pushback to free area */ undo_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE); memory_notify(MEM_CANCEL_OFFLINE, &arg); failed_removal_pcplists_disabled: @@ -1973,7 +1974,6 @@ failed_removal: (unsigned long long) start_pfn << PAGE_SHIFT, ((unsigned long long) end_pfn << PAGE_SHIFT) - 1, reason); - /* pushback to free area */ mem_hotplug_done(); return ret; }