Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8f95657 authored by Michal Hocko's avatar Michal Hocko Committed by Linus Torvalds
Browse files

mm, memory_hotplug: use node instead of zone in can_online_high_movable 

The primary purpose of this helper is to query the node state so use the
node id directly.  This is a preparatory patch for later changes.

This shouldn't introduce any functional change

Link: http://lkml.kernel.org/r/20170515085827.16474-3-mhocko@kernel.org


Signed-off-by: default avatarMichal Hocko <mhocko@suse.com>
Reviewed-by: default avatarYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Daniel Kiper <daniel.kiper@oracle.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: Joonsoo Kim <js1304@gmail.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Reza Arbab <arbab@linux.vnet.ibm.com>
Cc: Tobias Regnery <tobias.regnery@gmail.com>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: Xishi Qiu <qiuxishi@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dc0bbf3b

mm/memory_hotplug.c

+4 −4
Original line number Diff line number Diff line
@@ -941,15 +941,15 @@ static int online_pages_range(unsigned long start_pfn, unsigned long nr_pages, 
 * When CONFIG_MOVABLE_NODE, we permit onlining of a node which doesn't have

 * normal memory.

 */

static bool can_online_high_movable(struct zone *zone)

static bool can_online_high_movable(int nid)

{

	return true;

}

#else /* CONFIG_MOVABLE_NODE */

/* ensure every online node has NORMAL memory */

static bool can_online_high_movable(struct zone *zone)

static bool can_online_high_movable(int nid)

{

	return node_state(zone_to_nid(zone), N_NORMAL_MEMORY);

	return node_state(nid, N_NORMAL_MEMORY);

}

#endif /* CONFIG_MOVABLE_NODE */
@@ -1083,7 +1083,7 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ 


	if ((zone_idx(zone) > ZONE_NORMAL ||

	    online_type == MMOP_ONLINE_MOVABLE) &&

	    !can_online_high_movable(zone))

	    !can_online_high_movable(pfn_to_nid(pfn)))

		return -EINVAL;



	if (online_type == MMOP_ONLINE_KERNEL) {