tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Yinghai Lu and committed by
Ingo Molnar 6247943d 698839fe

+3 -8
-5
arch/x86/Kconfig
··· 455 455 memtest=4, mean do 4 test patterns. 456 456 If you are unsure how to answer this question, answer Y. 457 457 458 - config ACPI_SRAT 459 - def_bool y 460 - depends on X86_32 && ACPI && NUMA && X86_GENERICARCH 461 - select ACPI_NUMA 462 - 463 458 config X86_SUMMIT_NUMA 464 459 def_bool y 465 460 depends on X86_32 && NUMA && X86_GENERICARCH
-1
arch/x86/kernel/Makefile
··· 64 64 obj-y += vsmp_64.o 65 65 obj-$(CONFIG_KPROBES) += kprobes.o 66 66 obj-$(CONFIG_MODULES) += module_$(BITS).o 67 - obj-$(CONFIG_ACPI_SRAT) += srat_32.o 68 67 obj-$(CONFIG_EFI) += efi.o efi_$(BITS).o efi_stub_$(BITS).o 69 68 obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o 70 69 obj-$(CONFIG_KGDB) += kgdb.o
arch/x86/kernel/srat_32.c arch/x86/mm/srat_32.c
+2 -1
arch/x86/mm/Makefile
··· 13 13 else 14 14 obj-$(CONFIG_NUMA) += numa_64.o 15 15 obj-$(CONFIG_K8_NUMA) += k8topology_64.o 16 - obj-$(CONFIG_ACPI_NUMA) += srat_64.o 17 16 endif 17 + obj-$(CONFIG_ACPI_NUMA) += srat_$(BITS).o 18 +
+1 -1
include/asm-x86/srat.h
··· 27 27 #ifndef _ASM_SRAT_H_ 28 28 #define _ASM_SRAT_H_ 29 29 30 - #ifdef CONFIG_ACPI_SRAT 30 + #ifdef CONFIG_ACPI_NUMA 31 31 extern int get_memcfg_from_srat(void); 32 32 #else 33 33 static inline int get_memcfg_from_srat(void)