lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: remove acpi_srat config v2

Browse Source 
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>
This commit is contained in:
Yinghai Lu
2008-07-06 11:42:11 -07:00
committed by Ingo Molnar
parent 698839fe04
commit 6247943d8a
5 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/Kconfig
View File

@@ -455,11 +455,6 @@ config MEMTEST
memtest=4, mean do 4 test patterns. memtest=4, mean do 4 test patterns.
If you are unsure how to answer this question, answer Y. 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 config X86_SUMMIT_NUMA
def_bool y def_bool y
depends on X86_32 && NUMA && X86_GENERICARCH depends on X86_32 && NUMA && X86_GENERICARCH

1
arch/x86/kernel/Makefile
View File

@@ -64,7 +64,6 @@ obj-$(CONFIG_X86_SUMMIT_NUMA) += summit_32.o
obj-y += vsmp_64.o obj-y += vsmp_64.o
obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_KPROBES) += kprobes.o
obj-$(CONFIG_MODULES) += module_$(BITS).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_EFI) += efi.o efi_$(BITS).o efi_stub_$(BITS).o
obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o
obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_KGDB) += kgdb.o

3
arch/x86/mm/Makefile
View File

@@ -13,5 +13,6 @@ obj-$(CONFIG_NUMA) += discontig_32.o
else else
obj-$(CONFIG_NUMA) += numa_64.o obj-$(CONFIG_NUMA) += numa_64.o
obj-$(CONFIG_K8_NUMA) += k8topology_64.o obj-$(CONFIG_K8_NUMA) += k8topology_64.o
obj-$(CONFIG_ACPI_NUMA) += srat_64.o
endif endif
obj-$(CONFIG_ACPI_NUMA) += srat_$(BITS).o

0
arch/x86/kernel/srat_32.c → arch/x86/mm/srat_32.c
View File

2
include/asm-x86/srat.h
View File

@@ -27,7 +27,7 @@
#ifndef _ASM_SRAT_H_ #ifndef _ASM_SRAT_H_
#define _ASM_SRAT_H_ #define _ASM_SRAT_H_
#ifdef CONFIG_ACPI_SRAT #ifdef CONFIG_ACPI_NUMA
extern int get_memcfg_from_srat(void); extern int get_memcfg_from_srat(void);
#else #else
static inline int get_memcfg_from_srat(void) static inline int get_memcfg_from_srat(void)