build: convert NR_CPUS to Kconfig

Use CONFIG_NR_CPUS from Kconfig as NR_CPUS instead of the previous
MAX_PHYS_CPUS variable from make. Remove the creation of MAX_PHYS_CPUS
as well.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 8bd109825e6284c33a06951819d8fc904ea699c0..f29491e08d75d0c6665b87de9f0b3a3e57c22a49 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -59,9 +59,6 @@ CFLAGS-$(perfc_arrays)  += -DPERF_ARRAYS
 CFLAGS-$(lock_profile)  += -DLOCK_PROFILE
 CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER
 
-ifneq ($(max_phys_cpus),)
-CFLAGS-y                += -DMAX_PHYS_CPUS=$(max_phys_cpus)
-endif
 ifneq ($(max_phys_irqs),)
 CFLAGS-y                += -DMAX_PHYS_IRQS=$(max_phys_irqs)
 endif

diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h
index 1520b4123dee368b3ca35bdc2b893828aa46d0a1..bd832dffba25a3358d3c7a369713fd55b230c0b1 100644 (file)
--- a/xen/include/asm-arm/config.h
+++ b/xen/include/asm-arm/config.h
@@ -45,12 +45,6 @@
 
 #define OPT_CONSOLE_STR "dtuart"
 
-#ifdef MAX_PHYS_CPUS
-#define NR_CPUS MAX_PHYS_CPUS
-#else
-#define NR_CPUS 128
-#endif
-
 #ifdef CONFIG_ARM_64
 #define MAX_VIRT_CPUS 128
 #else

diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 3305a75aea898370a798c68fed595e9175436982..d97877dd78ce7373d2580ca7d40e068b69ae1832 100644 (file)
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -56,12 +56,6 @@
 
 #define OPT_CONSOLE_STR "vga"
 
-#ifdef MAX_PHYS_CPUS
-#define NR_CPUS MAX_PHYS_CPUS
-#else
-#define NR_CPUS 256
-#endif
-
 /* Linkage for x86 */
 #define __ALIGN .align 16,0x90
 #define __ALIGN_STR ".align 16,0x90"

diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h
index bba015ac06eed5515cdfaddfb75675998b063ebc..d780121d5f6fada46d07ad59cb600a795e2e21dd 100644 (file)
--- a/xen/include/xen/config.h
+++ b/xen/include/xen/config.h
@@ -92,4 +92,7 @@
 #define FLASK_AVC_STATS 1
 #endif
 
+/* allow existing code to work with Kconfig variable */
+#define NR_CPUS CONFIG_NR_CPUS
+
 #endif /* __XEN_CONFIG_H__ */