From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx166.postini.com [74.125.245.166]) by kanga.kvack.org (Postfix) with SMTP id CB3896B006E for ; Mon, 14 Jan 2013 05:54:57 -0500 (EST) From: Lin Feng Subject: [PATCH] memory-hotplug: revert register_page_bootmem_info_node() to empty when platform related code is not implemented Date: Mon, 14 Jan 2013 18:53:55 +0800 Message-Id: <1358160835-30617-1-git-send-email-linfeng@cn.fujitsu.com> Sender: owner-linux-mm@kvack.org List-ID: To: akpm@linux-foundation.org, mhocko@suse.cz, linux-mm@kvack.org Cc: wency@cn.fujitsu.com, jiang.liu@huawei.com, laijs@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, linux-kernel@vger.kernel.org, tangchen@cn.fujitsu.com, linfeng@cn.fujitsu.com Memory-hotplug codes for x86_64 have been implemented by patchset: https://lkml.org/lkml/2013/1/9/124 While other platforms haven't been completely implemented yet. If we enable both CONFIG_MEMORY_HOTPLUG_SPARSE and CONFIG_SPARSEMEM_VMEMMAP, register_page_bootmem_info_node() may be buggy, which is a hotplug generic function but falling back to call platform related function register_page_bootmem_memmap(). Other platforms such as powerpc it's not implemented, so on such platforms, revert them as empty as they were before. Reported-by: Michal Hocko Signed-off-by: Lin Feng --- mm/memory_hotplug.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 8aa2b56..bd93c2e 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -189,6 +189,7 @@ static void register_page_bootmem_info_section(unsigned long start_pfn) } #endif +#ifdef CONFIG_X86_64 void register_page_bootmem_info_node(struct pglist_data *pgdat) { unsigned long i, pfn, end_pfn, nr_pages; @@ -230,6 +231,14 @@ void register_page_bootmem_info_node(struct pglist_data *pgdat) register_page_bootmem_info_section(pfn); } } +#else +static inline void register_page_bootmem_info_node(struct pglist_data *pgdat) +{ + /* + * Todo: platforms other than X86_64 haven't been implemented yet. + */ +} +#endif static void grow_zone_span(struct zone *zone, unsigned long start_pfn, unsigned long end_pfn) -- 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