Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933715AbdC3Lzr (ORCPT ); Thu, 30 Mar 2017 07:55:47 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:34213 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933616AbdC3LzH (ORCPT ); Thu, 30 Mar 2017 07:55:07 -0400 From: Michal Hocko To: linux-mm@kvack.org Cc: Andrew Morton , Mel Gorman , Vlastimil Babka , Andrea Arcangeli , Reza Arbab , Yasuaki Ishimatsu , Tang Chen , qiuxishi@huawei.com, Kani Toshimitsu , slaoub@gmail.com, Joonsoo Kim , Andi Kleen , Zhang Zhen , David Rientjes , Daniel Kiper , Igor Mammedov , Vitaly Kuznetsov , LKML , Michal Hocko Subject: [PATCH 4/6] mm, memory_hotplug: use node instead of zone in can_online_high_movable Date: Thu, 30 Mar 2017 13:54:52 +0200 Message-Id: <20170330115454.32154-5-mhocko@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170330115454.32154-1-mhocko@kernel.org> References: <20170330115454.32154-1-mhocko@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1462 Lines: 44 From: Michal Hocko 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. Signed-off-by: Michal Hocko --- 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 056dbbe6d20e..221f622bcc88 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -936,15 +936,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 */ @@ -1078,7 +1078,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