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 <cardoe@cardoe.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 63f4b191c173ea26a018c632dad18c6dcb06b618..60d5fb86b2352c554c3867bc3337cc75b421b8d4 100644 (file)
--- 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 14519e3930dae2156dcc9d7de9b5a83340f6302f..c1fff66762f0fcc99f2b94c6b54cd6ebde097a97 100644 (file)
--- 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 1edcca7253ef9f2a9f94f3743efce1b9cc72d81e..1074dbf58058b25c803f4cfeaeb11ff3cfcb0321 100644 (file)
--- 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 fb6dfc3d3af8d3cecd84894ef695e33a056079ad..444b11d5839d36c266745de42e0903be940790d4 100644 (file)
--- 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 e90774110bf61a5af2ab452efaee0097c21f71e8..08addfb8a4c80b3664cb536b2b4204bc1a973cc2 100644 (file)
--- 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