From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Sun, 6 Jul 2008 18:42:11 +0000 (-0700)
Subject: x86: remove have_arch_parse_srat -v2
X-Git-Tag: v2.6.27-rc1~1106^2~81
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=698839fe04ae11f228074ad45614343c3921a6c6;p=linux-2.6-omap-h63xx.git

x86: remove have_arch_parse_srat -v2

we already have the same srat handling interface for 32bit.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 67e5275f03c..d8dddbc5e34 100644
--- a/arch/x86/Kconfig
+++ b/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/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c
index fa389d20383..5dfef9fa061 100644
--- a/arch/x86/mm/discontig_32.c
+++ b/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