Skip to content

Commit 36ba30b

Browse files
MiaoheLintorvalds
authored andcommitted
mm/memory_hotplug: fix misplaced comment in offline_pages
It's misplaced since commit 7960509 ("mm, memory_hotplug: print reason for the offlining failure"). Move it to the right place. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Miaohe Lin <[email protected]> Reviewed-by: David Hildenbrand <[email protected]> Reviewed-by: Oscar Salvador <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent b27340a commit 36ba30b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

mm/memory_hotplug.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1963,6 +1963,7 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages,
19631963
return 0;
19641964

19651965
failed_removal_isolated:
1966+
/* pushback to free area */
19661967
undo_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE);
19671968
memory_notify(MEM_CANCEL_OFFLINE, &arg);
19681969
failed_removal_pcplists_disabled:
@@ -1973,7 +1974,6 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages,
19731974
(unsigned long long) start_pfn << PAGE_SHIFT,
19741975
((unsigned long long) end_pfn << PAGE_SHIFT) - 1,
19751976
reason);
1976-
/* pushback to free area */
19771977
mem_hotplug_done();
19781978
return ret;
19791979
}

0 commit comments

Comments
 (0)