From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ob0-f174.google.com (mail-ob0-f174.google.com [209.85.214.174]) by kanga.kvack.org (Postfix) with ESMTP id 66C2C6B0038 for ; Fri, 17 Apr 2015 03:19:37 -0400 (EDT) Received: by obbfy7 with SMTP id fy7so62814444obb.2 for ; Fri, 17 Apr 2015 00:19:37 -0700 (PDT) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com. [58.251.152.64]) by mx.google.com with ESMTPS id p11si7278313oib.86.2015.04.17.00.19.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 17 Apr 2015 00:19:36 -0700 (PDT) Message-ID: <5530B2ED.8050002@huawei.com> Date: Fri, 17 Apr 2015 15:14:53 +0800 From: Xishi Qiu MIME-Version: 1.0 Subject: [PATCH 2/2] memory-hotplug: remove reset_node_managed_pages() and reset_node_managed_pages() in hotadd_new_pgdat() Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton , Yasuaki Ishimatsu , Kamezawa Hiroyuki , izumi.taku@jp.fujitsu.com, Tang Chen , Gu Zheng , Xiexiuqi , Mel Gorman , David Rientjes Cc: Xishi Qiu , Linux MM , LKML After hotadd_new_pgdat()->free_area_init_node(), pgdat's spanned/present are 0, and zone's spanned/present/managed are 0, so remove reset_node_managed_pages() and reset_node_managed_pages(). Signed-off-by: Xishi Qiu --- mm/memory_hotplug.c | 25 ------------------------- 1 files changed, 0 insertions(+), 25 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 457bde5..82c67ee 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1064,16 +1064,6 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ } #endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */ -static void reset_node_present_pages(pg_data_t *pgdat) -{ - struct zone *z; - - for (z = pgdat->node_zones; z < pgdat->node_zones + MAX_NR_ZONES; z++) - z->present_pages = 0; - - pgdat->node_present_pages = 0; -} - /* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */ static pg_data_t __ref *hotadd_new_pgdat(int nid, u64 start) { @@ -1108,21 +1098,6 @@ static pg_data_t __ref *hotadd_new_pgdat(int nid, u64 start) build_all_zonelists(pgdat, NULL); mutex_unlock(&zonelists_mutex); - /* - * zone->managed_pages is set to an approximate value in - * free_area_init_core(), which will cause - * /sys/device/system/node/nodeX/meminfo has wrong data. - * So reset it to 0 before any memory is onlined. - */ - reset_node_managed_pages(pgdat); - - /* - * When memory is hot-added, all the memory is in offline state. So - * clear all zones' present_pages because they will be updated in - * online_pages() and offline_pages(). - */ - reset_node_present_pages(pgdat); - return pgdat; } -- 1.7.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org