From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx174.postini.com [74.125.245.174]) by kanga.kvack.org (Postfix) with SMTP id A6E8290001B for ; Thu, 13 Jun 2013 09:28:19 -0400 (EDT) From: Tang Chen Subject: [Part2 PATCH v4 10/15] x86, numa: Move memory_add_physaddr_to_nid() to CONFIG_NUMA. Date: Thu, 13 Jun 2013 21:03:34 +0800 Message-Id: <1371128619-8987-11-git-send-email-tangchen@cn.fujitsu.com> In-Reply-To: <1371128619-8987-1-git-send-email-tangchen@cn.fujitsu.com> References: <1371128619-8987-1-git-send-email-tangchen@cn.fujitsu.com> Sender: owner-linux-mm@kvack.org List-ID: To: tglx@linutronix.de, mingo@elte.hu, hpa@zytor.com, akpm@linux-foundation.org, tj@kernel.org, trenn@suse.de, yinghai@kernel.org, jiang.liu@huawei.com, wency@cn.fujitsu.com, laijs@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, mgorman@suse.de, minchan@kernel.org, mina86@mina86.com, gong.chen@linux.intel.com, vasilis.liaskovitis@profitbricks.com, lwoodman@redhat.com, riel@redhat.com, jweiner@redhat.com, prarit@redhat.com Cc: x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org memory_add_physaddr_to_nid() is declared in include/linux/memory_hotplug.h, protected by CONFIG_NUMA. And in x86, the definitions are protected by CONFIG_MEMORY_HOTPLUG. memory_add_physaddr_to_nid() uses numa_meminfo to find the physical address's nid. It has nothing to do with memory hotplug. And also, it can be used by alloc_low_pages() to obtain nid of the allocated memory. So in x86, also use CONFIG_NUMA to protect it. Signed-off-by: Tang Chen --- arch/x86/mm/numa.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 1242190..2b5057f 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -1009,7 +1009,7 @@ EXPORT_SYMBOL(cpumask_of_node); #endif /* !CONFIG_DEBUG_PER_CPU_MAPS */ -#ifdef CONFIG_MEMORY_HOTPLUG +#ifdef CONFIG_NUMA int memory_add_physaddr_to_nid(u64 start) { struct numa_meminfo *mi = &numa_meminfo; -- 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