Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6247943d authored Jul 06, 2008 by Yinghai Lu Committed by Ingo Molnar Jul 08, 2008

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>

parent 698839fe

arch/x86/Kconfig

+0 −5

Original line number	Diff line number	Diff line
		@@ -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

arch/x86/kernel/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

arch/x86/mm/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -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

arch/x86/kernel/srat_32.c→arch/x86/mm/srat_32.c

+0 −0

File moved.

include/asm-x86/srat.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)