| Message ID | 1456457952-9676-4-git-send-email-cardoe@cardoe.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Feb 25, 2016 at 09:39:11PM -0600, Doug Goldstein wrote: > Convert HAS_NUMA to Kconfig as CONFIG_NUMA and let CONFIG_NUMA be > defined by Kconfig. > > Signed-off-by: Doug Goldstein <cardoe@cardoe.com> > --- > CC: Keir Fraser <keir@xen.org> > CC: Jan Beulich <jbeulich@suse.com> > CC: Andrew Cooper <andrew.cooper3@citrix.com> > --- > xen/arch/x86/Kconfig | 1 + > xen/arch/x86/Rules.mk | 1 - > xen/drivers/acpi/Kconfig | 3 +++ > xen/drivers/acpi/Makefile | 2 +- > xen/include/asm-x86/config.h | 1 - > 5 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig > index 6343b0b..1e663e3 100644 > --- a/xen/arch/x86/Kconfig > +++ b/xen/arch/x86/Kconfig > @@ -18,6 +18,7 @@ config X86 > select HAS_PASSTHROUGH > select HAS_PCI > select HAS_PDX > + select NUMA Odd spacing? > select VGA > > config ARCH_DEFCONFIG > diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk > index 14519e3..c1fff66 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 1edcca7..9688b97 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 fb6dfc3..444b11d 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 0fb9839..dd1d4aa 100644 > --- a/xen/include/asm-x86/config.h > +++ b/xen/include/asm-x86/config.h > @@ -24,7 +24,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 > -- > 2.4.10 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel
On 2/26/16 12:56 PM, Konrad Rzeszutek Wilk wrote: > On Thu, Feb 25, 2016 at 09:39:11PM -0600, Doug Goldstein wrote: >5 files changed, 5 insertions(+), 3 deletions(-) >> >> diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig >> index 6343b0b..1e663e3 100644 >> --- a/xen/arch/x86/Kconfig >> +++ b/xen/arch/x86/Kconfig >> @@ -18,6 +18,7 @@ config X86 >> select HAS_PASSTHROUGH >> select HAS_PCI >> select HAS_PDX >> + select NUMA > > Odd spacing? > Yeah I screwed up. I just fixed my vimrc to ensure that doesn't happen again.
diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 6343b0b..1e663e3 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -18,6 +18,7 @@ config X86 select HAS_PASSTHROUGH select HAS_PCI select HAS_PDX + select NUMA select VGA config ARCH_DEFCONFIG diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 14519e3..c1fff66 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 1edcca7..9688b97 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 fb6dfc3..444b11d 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 0fb9839..dd1d4aa 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -24,7 +24,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
Convert HAS_NUMA to Kconfig as CONFIG_NUMA and let CONFIG_NUMA be defined by Kconfig. Signed-off-by: Doug Goldstein <cardoe@cardoe.com> --- CC: Keir Fraser <keir@xen.org> CC: Jan Beulich <jbeulich@suse.com> CC: Andrew Cooper <andrew.cooper3@citrix.com> --- xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/drivers/acpi/Kconfig | 3 +++ xen/drivers/acpi/Makefile | 2 +- xen/include/asm-x86/config.h | 1 - 5 files changed, 5 insertions(+), 3 deletions(-)