x86: remove acpi_srat config v2

use ACPI_NUMA directly

and move srat_32.c to mm/

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 d8dddbc5e3494962c493f714a181f53218ae182a..bb0c0d0f6db7ef0b4e7f1769c4d94d83acaa9717 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -455,11 +455,6 @@ config MEMTEST
                memtest=4, mean do 4 test patterns.
          If you are unsure how to answer this question, answer Y.
 
-config ACPI_SRAT
-       def_bool y
-       depends on X86_32 && ACPI && NUMA && X86_GENERICARCH
-       select ACPI_NUMA
-
 config X86_SUMMIT_NUMA
        def_bool y
        depends on X86_32 && NUMA && X86_GENERICARCH

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 212804e78787f42dfb4b15cd3b9def6a2a706597..54829e2b5160d8a763fcef682764bfa99357fdd9 100644 (file)
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -64,7 +64,6 @@ obj-$(CONFIG_X86_SUMMIT_NUMA) += summit_32.o
 obj-y                          += vsmp_64.o
 obj-$(CONFIG_KPROBES)          += kprobes.o
 obj-$(CONFIG_MODULES)          += module_$(BITS).o
-obj-$(CONFIG_ACPI_SRAT)        += srat_32.o
 obj-$(CONFIG_EFI)              += efi.o efi_$(BITS).o efi_stub_$(BITS).o
 obj-$(CONFIG_DOUBLEFAULT)      += doublefault_32.o
 obj-$(CONFIG_KGDB)             += kgdb.o

diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index b7b3e4c7cfc9c4cd35e953ba75d64ad7cde484f5..c107641cd39bfadb4969b6b86183fe666034616e 100644 (file)
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -13,5 +13,6 @@ obj-$(CONFIG_NUMA)            += discontig_32.o
 else
 obj-$(CONFIG_NUMA)             += numa_64.o
 obj-$(CONFIG_K8_NUMA)          += k8topology_64.o
-obj-$(CONFIG_ACPI_NUMA)                += srat_64.o
 endif
+obj-$(CONFIG_ACPI_NUMA)                += srat_$(BITS).o
+

diff --git a/arch/x86/kernel/srat_32.c b/arch/x86/mm/srat_32.c
similarity index 100%
rename from arch/x86/kernel/srat_32.c
rename to arch/x86/mm/srat_32.c

diff --git a/include/asm-x86/srat.h b/include/asm-x86/srat.h
index 456fe0b5a92162245d3b63ba8a497f762aae474a..774c919dc2323cb7ecb85b1350876146414286db 100644 (file)
--- a/include/asm-x86/srat.h
+++ b/include/asm-x86/srat.h
@@ -27,7 +27,7 @@
 #ifndef _ASM_SRAT_H_
 #define _ASM_SRAT_H_
 
-#ifdef CONFIG_ACPI_SRAT
+#ifdef CONFIG_ACPI_NUMA
 extern int get_memcfg_from_srat(void);
 #else
 static inline int get_memcfg_from_srat(void)