---

yaml --- r: 99368 b: refs/heads/master c: 6a1673a h: refs/heads/master v: v3
git-mirror · May 25, 2008 · 4bb7411 · 4bb7411
1 parent e1bd5bd
commit 4bb7411
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cca7c0850fa0381639bf84dd06ee900e16346373
+refs/heads/master: 6a1673ae2201931ce34bf7ba9f90928c864d8334
diff --git a/trunk/arch/x86/mm/srat_64.c b/trunk/arch/x86/mm/srat_64.c
@@ -522,6 +522,7 @@ int __node_distance(int a, int b)
 
 EXPORT_SYMBOL(__node_distance);
 
+#if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) || defined(CONFIG_ACPI_HOTPLUG_MEMORY)
 int memory_add_physaddr_to_nid(u64 start)
 {
 	int i, ret = 0;
@@ -533,4 +534,4 @@ int memory_add_physaddr_to_nid(u64 start)
 	return ret;
 }
 EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
-
+#endif