| Message ID | 1452549733-13401-2-git-send-email-cardoe@cardoe.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 11.01.16 at 23:02, <cardoe@cardoe.com> wrote: > --- 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 Perhaps here or in a follow-up patch derive CONFIG_SMP (used in a few places in ARM code) from NR_CPUS > 1? Jan
On 1/12/16 2:41 AM, Jan Beulich wrote: >>>> On 11.01.16 at 23:02, <cardoe@cardoe.com> wrote: >> --- 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 > > Perhaps here or in a follow-up patch derive CONFIG_SMP (used in a > few places in ARM code) from NR_CPUS > 1? > > Jan > I agree with you. That's actually in a follow on. I've got most of the CONFIG_ fields in a branch locally and as each patch gets reviewed I'm submitting more.
diff --git a/xen/Rules.mk b/xen/Rules.mk index f7ddc69..b5f1041 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -61,9 +61,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 1520b41..bd832df 100644 --- 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 f25d92e..3958ea0 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -60,12 +60,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 7595599..cde2006 100644 --- 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__ */
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. CC: Ian Campbell <ian.campbell@citrix.com> CC: Stefano Stabellini <stefano.stabellini@citrix.com> CC: Keir Fraser <keir@xen.org> CC: Jan Beulich <jbeulich@suse.com> CC: Andrew Cooper <andrew.cooper3@citrix.com> Signed-off-by: Doug Goldstein <cardoe@cardoe.com> --- xen/Rules.mk | 3 --- xen/include/asm-arm/config.h | 6 ------ xen/include/asm-x86/config.h | 6 ------ xen/include/xen/config.h | 3 +++ 4 files changed, 3 insertions(+), 15 deletions(-)