On 04/10/2017 07:03 AM, Michal Hocko wrote: > From: Michal Hocko <mhocko@xxxxxxxx> > > 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 > > Signed-off-by: Michal Hocko <mhocko@xxxxxxxx> > --- Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@xxxxxxxxxxxxxx> Thanks, Yasuaki Ishimatsu > mm/memory_hotplug.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c > index 9ed251811ec3..342332f29364 100644 > --- a/mm/memory_hotplug.c > +++ b/mm/memory_hotplug.c > @@ -940,15 +940,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 */ > > @@ -1082,7 +1082,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) { > -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>