Messages in this thread Patch in this message | | | From | Michal Hocko <> | Subject | [PATCH 2/9] mm, memory_hotplug: use node instead of zone in can_online_high_movable | Date | Mon, 10 Apr 2017 13:03:44 +0200 |
| |
From: Michal Hocko <mhocko@suse.com>
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@suse.com> --- 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) { -- 2.11.0
| |