---

yaml --- r: 100005 b: refs/heads/master c: 698839f h: refs/heads/master i: 100003: 021bc86 v: v3
git-mirror · Jul 8, 2008 · c5a4d7f · c5a4d7f
1 parent 22816ce
commit c5a4d7f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 22 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a29d1cfe9e9337aedeed505afddc8465ac709b87
+refs/heads/master: 698839fe04ae11f228074ad45614343c3921a6c6
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
@@ -460,10 +460,6 @@ config ACPI_SRAT
 	depends on X86_32 && ACPI && NUMA && X86_GENERICARCH
 	select ACPI_NUMA
 
-config HAVE_ARCH_PARSE_SRAT
-	def_bool y
-	depends on ACPI_SRAT
-
 config X86_SUMMIT_NUMA
 	def_bool y
 	depends on X86_32 && NUMA && X86_GENERICARCH

diff --git a/trunk/arch/x86/mm/discontig_32.c b/trunk/arch/x86/mm/discontig_32.c
@@ -443,20 +443,3 @@ int memory_add_physaddr_to_nid(u64 addr)
 EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
 #endif
 
-#if defined(CONFIG_ACPI_NUMA) && !defined(CONFIG_HAVE_ARCH_PARSE_SRAT)
-/*
- * Dummy on 32-bit, for now:
- */
-void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
-{
-}
-
-void __init
-acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
-{
-}
-
-void __init acpi_numa_arch_fixup(void)
-{
-}
-#endif