From d25adef7c844150fead8276f9c2e3674593bf3db Mon Sep 17 00:00:00 2001
From: Yasunori Goto <y-goto@jp.fujitsu.com>
Date: Sat, 18 Nov 2006 22:19:40 -0800
Subject: [PATCH] --- yaml --- r: 41015 b: refs/heads/master c:
 8243229f0940ab4e9f501879d3ffb7476b02ee6a h: refs/heads/master i:   41013:
 9e939727674593e16cd10d2512805a8231d5c0ca   41011:
 ed333289e212acbc478affaab0732752ddf6a3a1   41007:
 ae173120001fc67b39cd0ac6c4ed552a5dc5c63d v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86_64/mm/init.c | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 025a9955acd7..098176eda21a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffb3d1348605816de10d4e57281e02f606508b6c
+refs/heads/master: 8243229f0940ab4e9f501879d3ffb7476b02ee6a
diff --git a/trunk/arch/x86_64/mm/init.c b/trunk/arch/x86_64/mm/init.c
index f1f977aafae1..4c0c00ef3ca7 100644
--- a/trunk/arch/x86_64/mm/init.c
+++ b/trunk/arch/x86_64/mm/init.c
@@ -496,7 +496,7 @@ int remove_memory(u64 start, u64 size)
 }
 EXPORT_SYMBOL_GPL(remove_memory);
 
-#ifndef CONFIG_ACPI_NUMA
+#if !defined(CONFIG_ACPI_NUMA) && defined(CONFIG_NUMA)
 int memory_add_physaddr_to_nid(u64 start)
 {
 	return 0;
@@ -504,13 +504,6 @@ int memory_add_physaddr_to_nid(u64 start)
 EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
 #endif
 
-#ifndef CONFIG_ACPI_NUMA
-int memory_add_physaddr_to_nid(u64 start)
-{
-	return 0;
-}
-#endif
-
 #endif /* CONFIG_MEMORY_HOTPLUG */
 
 #ifdef CONFIG_MEMORY_HOTPLUG_RESERVE