Commit 28aea75c authored Mar 17, 2016 by Vlastimil Babka Committed by Vinayak Menon Feb 21, 2017

mm, memory hotplug: small cleanup in online_pages()

We can reuse the nid we've determined instead of repeated pfn_to_nid()
usages.  Also zone_to_nid() should be a bit cheaper in general than
pfn_to_nid().

Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: David Rientjes <rientjes@google.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Git-commit: e888ca3545dc6823603b976e40b62af2c68b6fcc
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

Change-Id: I6bdb2530fd6306ceb49022ef9cdc82b5598ebe8c
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>

parent f9d29d58

mm/memory_hotplug.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1013,7 +1013,7 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ
		arg.nr_pages = nr_pages;
		node_states_check_changes_online(nr_pages, zone, &arg);

		nid = pfn_to_nid(pfn);
		nid = zone_to_nid(zone);

		ret = memory_notify(MEM_GOING_ONLINE, &arg);
		ret = notifier_to_errno(ret);
		@@ -1053,7 +1053,7 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ
		pgdat_resize_unlock(zone->zone_pgdat, &flags);

		if (onlined_pages) {
		node_states_set_node(zone_to_nid(zone), &arg);
		node_states_set_node(nid, &arg);
		if (need_zonelists_rebuild)
		build_all_zonelists(NULL, NULL);
		else
		@@ -1065,7 +1065,7 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ
		init_per_zone_wmark_min();

		if (onlined_pages) {
		kswapd_run(zone_to_nid(zone));
		kswapd_run(nid);
		kcompactd_run(nid);
		}