From: Doug Goldstein Date: Fri, 26 Feb 2016 11:33:14 +0000 (+0100) Subject: build: convert HAS_NUMA to Kconfig X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2a13d1366e77317f097167271a06884ff6b1ece8;p=people%2Fliuw%2Fxen.git build: convert HAS_NUMA to Kconfig Convert HAS_NUMA to Kconfig as CONFIG_NUMA and let CONFIG_NUMA be defined by Kconfig. Signed-off-by: Doug Goldstein Reviewed-by: Jan Beulich --- diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 63f4b191c1..60d5fb86b2 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -19,6 +19,7 @@ config X86 select HAS_PCI select HAS_PDX select HAS_VGA + select NUMA config ARCH_DEFCONFIG string diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 14519e3930..c1fff66762 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -1,7 +1,6 @@ ######################################## # x86-specific definitions -HAS_NUMA := y HAS_CORE_PARKING := y CFLAGS += -I$(BASEDIR)/include diff --git a/xen/drivers/acpi/Kconfig b/xen/drivers/acpi/Kconfig index 1edcca7253..1074dbf580 100644 --- a/xen/drivers/acpi/Kconfig +++ b/xen/drivers/acpi/Kconfig @@ -5,3 +5,6 @@ config ACPI config ACPI_LEGACY_TABLES_LOOKUP bool + +config NUMA + bool diff --git a/xen/drivers/acpi/Makefile b/xen/drivers/acpi/Makefile index fb6dfc3d3a..444b11d583 100644 --- a/xen/drivers/acpi/Makefile +++ b/xen/drivers/acpi/Makefile @@ -3,7 +3,7 @@ subdir-y += utilities subdir-$(CONFIG_X86) += apei obj-bin-y += tables.init.o -obj-$(HAS_NUMA) += numa.o +obj-$(CONFIG_NUMA) += numa.o obj-y += osl.o obj-$(CONFIG_HAS_CPUFREQ) += pmstat.o diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index e90774110b..08addfb8a4 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -25,7 +25,6 @@ #define CONFIG_HPET_TIMER 1 #define CONFIG_X86_MCE_THERMAL 1 #define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS 1 -#define CONFIG_NUMA 1 #define CONFIG_DISCONTIGMEM 1 #define CONFIG_NUMA_EMU 1 #define CONFIG_DOMAIN_PAGE 1