* [PATCH 0/4] handful of Kconfig changes
@ 2016-02-26 3:39 Doug Goldstein
2016-02-26 3:39 ` [PATCH 1/4] build: consolidate CONFIG_HAS_VIDEO and CONFIG_VIDEO Doug Goldstein
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Doug Goldstein @ 2016-02-26 3:39 UTC (permalink / raw)
To: xen-devel
Cc: Keir Fraser, Ian Campbell, Andrew Cooper, Doug Goldstein,
Stefano Stabellini, Jan Beulich
Mostly just simplification, consolidation, and more conversion. The
last two were entries added while the original series was in the last
steps of review so they just needed to be finished up.
Doug Goldstein (4):
build: consolidate CONFIG_HAS_VIDEO and CONFIG_VIDEO
build: consolidate CONFIG_HAS_ACPI and CONFIG_ACPI
build: convert HAS_NUMA to Kconfig
build: convert HAS_CORE_PARKING to Kconfig
xen/arch/arm/Kconfig | 2 +-
xen/arch/x86/Kconfig | 4 +++-
xen/arch/x86/Rules.mk | 5 +----
xen/common/Kconfig | 3 +++
xen/common/Makefile | 2 +-
xen/common/sysctl.c | 2 +-
xen/drivers/Makefile | 4 ++--
xen/drivers/acpi/Kconfig | 7 +++++--
xen/drivers/acpi/Makefile | 2 +-
xen/drivers/video/Kconfig | 6 +++---
xen/drivers/video/Makefile | 8 ++++----
xen/include/asm-arm/config.h | 2 --
xen/include/asm-x86/config.h | 4 ----
13 files changed, 25 insertions(+), 26 deletions(-)
--
2.4.10
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/4] build: consolidate CONFIG_HAS_VIDEO and CONFIG_VIDEO
2016-02-26 3:39 [PATCH 0/4] handful of Kconfig changes Doug Goldstein
@ 2016-02-26 3:39 ` Doug Goldstein
2016-02-26 11:35 ` Jan Beulich
2016-02-26 3:39 ` [PATCH 2/4] build: consolidate CONFIG_HAS_ACPI and CONFIG_ACPI Doug Goldstein
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Doug Goldstein @ 2016-02-26 3:39 UTC (permalink / raw)
To: xen-devel
Cc: Keir Fraser, Ian Campbell, Andrew Cooper, Doug Goldstein,
Stefano Stabellini, Jan Beulich
No real advantage to keeping these separate. The use case of this from
Linux is when the platform or target board has support for something but
the user wants to be given the option to disable it.
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
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>
---
xen/arch/arm/Kconfig | 2 +-
xen/drivers/Makefile | 2 +-
xen/drivers/video/Kconfig | 6 +++---
xen/drivers/video/Makefile | 8 ++++----
xen/include/asm-arm/config.h | 2 --
xen/include/asm-x86/config.h | 2 --
6 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index 60e923c..cb99df5 100644
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -22,7 +22,7 @@ config ARM
select HAS_MEM_ACCESS
select HAS_PASSTHROUGH
select HAS_PDX
- select HAS_VIDEO
+ select VIDEO
config ARCH_DEFCONFIG
string
diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile
index 7bbb654..ec2b8f2 100644
--- a/xen/drivers/Makefile
+++ b/xen/drivers/Makefile
@@ -3,4 +3,4 @@ subdir-$(CONFIG_HAS_CPUFREQ) += cpufreq
subdir-$(CONFIG_HAS_PCI) += pci
subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough
subdir-$(CONFIG_HAS_ACPI) += acpi
-subdir-$(CONFIG_HAS_VIDEO) += video
+subdir-$(CONFIG_VIDEO) += video
diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig
index 03e1e18..739fe6f 100644
--- a/xen/drivers/video/Kconfig
+++ b/xen/drivers/video/Kconfig
@@ -1,12 +1,12 @@
-# Select HAS_VIDEO if video is supported
-config HAS_VIDEO
+# Select VIDEO if video is supported
+config VIDEO
bool
# Select VGA if VGA is supported
config VGA
bool
- select HAS_VIDEO
+ select VIDEO
# Select HAS_ARM_HDLCD if ARM HDLCD is supported
config HAS_ARM_HDLCD
diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile
index fab7aba..2bb91d6 100644
--- a/xen/drivers/video/Makefile
+++ b/xen/drivers/video/Makefile
@@ -1,7 +1,7 @@
obj-$(CONFIG_VGA) := vga.o
-obj-$(CONFIG_HAS_VIDEO) += font_8x14.o
-obj-$(CONFIG_HAS_VIDEO) += font_8x16.o
-obj-$(CONFIG_HAS_VIDEO) += font_8x8.o
-obj-$(CONFIG_HAS_VIDEO) += lfb.o
+obj-$(CONFIG_VIDEO) += font_8x14.o
+obj-$(CONFIG_VIDEO) += font_8x16.o
+obj-$(CONFIG_VIDEO) += font_8x8.o
+obj-$(CONFIG_VIDEO) += lfb.o
obj-$(CONFIG_VGA) += vesa.o
obj-$(CONFIG_HAS_ARM_HDLCD) += arm_hdlcd.o
diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h
index c3a2c30..43ecfb4 100644
--- a/xen/include/asm-arm/config.h
+++ b/xen/include/asm-arm/config.h
@@ -32,8 +32,6 @@
#define CONFIG_SMP 1
-#define CONFIG_VIDEO 1
-
#define CONFIG_IRQ_HAS_MULTIPLE_ACTION 1
#define CONFIG_PAGEALLOC_MAX_ORDER 18
diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 3274337..ca303b6 100644
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -43,8 +43,6 @@
#define CONFIG_ACPI_SRAT 1
#define CONFIG_ACPI_CSTATE 1
-#define CONFIG_VIDEO 1
-
#define CONFIG_WATCHDOG 1
#define CONFIG_MULTIBOOT 1
--
2.4.10
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/4] build: consolidate CONFIG_HAS_ACPI and CONFIG_ACPI
2016-02-26 3:39 [PATCH 0/4] handful of Kconfig changes Doug Goldstein
2016-02-26 3:39 ` [PATCH 1/4] build: consolidate CONFIG_HAS_VIDEO and CONFIG_VIDEO Doug Goldstein
@ 2016-02-26 3:39 ` Doug Goldstein
2016-02-26 3:39 ` [PATCH 3/4] build: convert HAS_NUMA to Kconfig Doug Goldstein
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Doug Goldstein @ 2016-02-26 3:39 UTC (permalink / raw)
To: xen-devel; +Cc: Keir Fraser, Doug Goldstein, Jan Beulich, Andrew Cooper
No real advantage to keeping these separate. The use case of this from
Linux is when the platform or target board has support for something but
the user wants to be given the option to disable it.
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 | 2 +-
xen/common/sysctl.c | 2 +-
xen/drivers/Makefile | 2 +-
xen/drivers/acpi/Kconfig | 4 ++--
xen/include/asm-x86/config.h | 1 -
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index ce70794..6343b0b 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -3,9 +3,9 @@ config X86_64
config X86
def_bool y
+ select ACPI
select ACPI_LEGACY_TABLES_LOOKUP
select COMPAT
- select HAS_ACPI
select HAS_CPUFREQ
select HAS_EHCI
select HAS_GDBSX
diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c
index 1624024..58162f5 100644
--- a/xen/common/sysctl.c
+++ b/xen/common/sysctl.c
@@ -171,7 +171,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl)
op->u.availheap.avail_bytes <<= PAGE_SHIFT;
break;
-#if defined (CONFIG_HAS_ACPI) && defined (CONFIG_HAS_CPUFREQ)
+#if defined (CONFIG_ACPI) && defined (CONFIG_HAS_CPUFREQ)
case XEN_SYSCTL_get_pmstat:
ret = do_get_pm_info(&op->u.get_pmstat);
break;
diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile
index ec2b8f2..1939180 100644
--- a/xen/drivers/Makefile
+++ b/xen/drivers/Makefile
@@ -2,5 +2,5 @@ subdir-y += char
subdir-$(CONFIG_HAS_CPUFREQ) += cpufreq
subdir-$(CONFIG_HAS_PCI) += pci
subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough
-subdir-$(CONFIG_HAS_ACPI) += acpi
+subdir-$(CONFIG_ACPI) += acpi
subdir-$(CONFIG_VIDEO) += video
diff --git a/xen/drivers/acpi/Kconfig b/xen/drivers/acpi/Kconfig
index 82d73ca..1edcca7 100644
--- a/xen/drivers/acpi/Kconfig
+++ b/xen/drivers/acpi/Kconfig
@@ -1,6 +1,6 @@
-# Select HAS_ACPI if ACPI is supported
-config HAS_ACPI
+# Select ACPI if ACPI is supported
+config ACPI
bool
config ACPI_LEGACY_TABLES_LOOKUP
diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index ca303b6..0fb9839 100644
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -36,7 +36,6 @@
/* Intel P4 currently has largest cache line (L2 line size is 128 bytes). */
#define CONFIG_X86_L1_CACHE_SHIFT 7
-#define CONFIG_ACPI 1
#define CONFIG_ACPI_BOOT 1
#define CONFIG_ACPI_SLEEP 1
#define CONFIG_ACPI_NUMA 1
--
2.4.10
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/4] build: convert HAS_NUMA to Kconfig
2016-02-26 3:39 [PATCH 0/4] handful of Kconfig changes Doug Goldstein
2016-02-26 3:39 ` [PATCH 1/4] build: consolidate CONFIG_HAS_VIDEO and CONFIG_VIDEO Doug Goldstein
2016-02-26 3:39 ` [PATCH 2/4] build: consolidate CONFIG_HAS_ACPI and CONFIG_ACPI Doug Goldstein
@ 2016-02-26 3:39 ` Doug Goldstein
2016-02-26 18:56 ` Konrad Rzeszutek Wilk
2016-02-26 3:39 ` [PATCH 4/4] build: convert HAS_CORE_PARKING " Doug Goldstein
2016-02-26 9:30 ` [PATCH 0/4] handful of Kconfig changes Jan Beulich
4 siblings, 1 reply; 9+ messages in thread
From: Doug Goldstein @ 2016-02-26 3:39 UTC (permalink / raw)
To: xen-devel; +Cc: Keir Fraser, Doug Goldstein, Jan Beulich, Andrew Cooper
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
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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/4] build: convert HAS_CORE_PARKING to Kconfig
2016-02-26 3:39 [PATCH 0/4] handful of Kconfig changes Doug Goldstein
` (2 preceding siblings ...)
2016-02-26 3:39 ` [PATCH 3/4] build: convert HAS_NUMA to Kconfig Doug Goldstein
@ 2016-02-26 3:39 ` Doug Goldstein
2016-02-26 9:30 ` [PATCH 0/4] handful of Kconfig changes Jan Beulich
4 siblings, 0 replies; 9+ messages in thread
From: Doug Goldstein @ 2016-02-26 3:39 UTC (permalink / raw)
To: xen-devel; +Cc: Keir Fraser, Doug Goldstein, Jan Beulich, Andrew Cooper
Convert HAS_CORE_PARKING to Kconfig as CONFIG_CORE_PARKING. While
removing HAS_CORE_PARKING, removed a trailing whitespace on a near by
line.
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 | 4 +---
xen/common/Kconfig | 3 +++
xen/common/Makefile | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 1e663e3..435587e 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -6,6 +6,7 @@ config X86
select ACPI
select ACPI_LEGACY_TABLES_LOOKUP
select COMPAT
+ select CORE_PARKING
select HAS_CPUFREQ
select HAS_EHCI
select HAS_GDBSX
diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index c1fff66..3139886 100644
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -1,9 +1,7 @@
########################################
# x86-specific definitions
-HAS_CORE_PARKING := y
-
-CFLAGS += -I$(BASEDIR)/include
+CFLAGS += -I$(BASEDIR)/include
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default
CFLAGS += '-D__OBJECT_LABEL__=$(subst /,$$,$(subst -,_,$(subst $(BASEDIR)/,,$(CURDIR))/$@))'
diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index a1097ef..d1e6359 100644
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -8,6 +8,9 @@ config COMPAT
HVM and PV guests. HVMLoader makes 32-bit hypercalls irrespective
of the destination runmode of the guest.
+config CORE_PARKING
+ bool
+
config FLASK
bool "FLux Advanced Security Kernel support"
default y
diff --git a/xen/common/Makefile b/xen/common/Makefile
index 57f4ed7..82625a5 100644
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -1,5 +1,5 @@
obj-y += bitmap.o
-obj-$(HAS_CORE_PARKING) += core_parking.o
+obj-$(CONFIG_CORE_PARKING) += core_parking.o
obj-y += cpu.o
obj-y += cpupool.o
obj-$(CONFIG_HAS_DEVICE_TREE) += device_tree.o
--
2.4.10
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 0/4] handful of Kconfig changes
2016-02-26 3:39 [PATCH 0/4] handful of Kconfig changes Doug Goldstein
` (3 preceding siblings ...)
2016-02-26 3:39 ` [PATCH 4/4] build: convert HAS_CORE_PARKING " Doug Goldstein
@ 2016-02-26 9:30 ` Jan Beulich
4 siblings, 0 replies; 9+ messages in thread
From: Jan Beulich @ 2016-02-26 9:30 UTC (permalink / raw)
To: Doug Goldstein
Cc: Andrew Cooper, Keir Fraser, Stefano Stabellini, Ian Campbell,
xen-devel
>>> On 26.02.16 at 04:39, <cardoe@cardoe.com> wrote:
> Mostly just simplification, consolidation, and more conversion. The
> last two were entries added while the original series was in the last
> steps of review so they just needed to be finished up.
>
> Doug Goldstein (4):
> build: consolidate CONFIG_HAS_VIDEO and CONFIG_VIDEO
> build: consolidate CONFIG_HAS_ACPI and CONFIG_ACPI
> build: convert HAS_NUMA to Kconfig
> build: convert HAS_CORE_PARKING to Kconfig
Patches 3 and 4 have indentation issues, which could be fixed up
while committing, and with them adjusted
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Jan
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/4] build: consolidate CONFIG_HAS_VIDEO and CONFIG_VIDEO
2016-02-26 3:39 ` [PATCH 1/4] build: consolidate CONFIG_HAS_VIDEO and CONFIG_VIDEO Doug Goldstein
@ 2016-02-26 11:35 ` Jan Beulich
0 siblings, 0 replies; 9+ messages in thread
From: Jan Beulich @ 2016-02-26 11:35 UTC (permalink / raw)
To: Doug Goldstein
Cc: Andrew Cooper, Keir Fraser, Stefano Stabellini, Ian Campbell,
xen-devel
>>> On 26.02.16 at 04:39, <cardoe@cardoe.com> wrote:
> --- a/xen/drivers/video/Kconfig
> +++ b/xen/drivers/video/Kconfig
> @@ -1,12 +1,12 @@
>
> -# Select HAS_VIDEO if video is supported
> -config HAS_VIDEO
> +# Select VIDEO if video is supported
> +config VIDEO
> bool
>
> # Select VGA if VGA is supported
> config VGA
> bool
> - select HAS_VIDEO
> + select VIDEO
Even if the needed ARM ack was in place, this wouldn't apply. I
suppose there is another patch missing ahead of this one,
converting HAS_VGA -> VGA.
Jan
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/4] build: convert HAS_NUMA to Kconfig
2016-02-26 3:39 ` [PATCH 3/4] build: convert HAS_NUMA to Kconfig Doug Goldstein
@ 2016-02-26 18:56 ` Konrad Rzeszutek Wilk
2016-02-26 19:53 ` Doug Goldstein
0 siblings, 1 reply; 9+ messages in thread
From: Konrad Rzeszutek Wilk @ 2016-02-26 18:56 UTC (permalink / raw)
To: Doug Goldstein; +Cc: Andrew Cooper, Keir Fraser, Jan Beulich, xen-devel
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
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/4] build: convert HAS_NUMA to Kconfig
2016-02-26 18:56 ` Konrad Rzeszutek Wilk
@ 2016-02-26 19:53 ` Doug Goldstein
0 siblings, 0 replies; 9+ messages in thread
From: Doug Goldstein @ 2016-02-26 19:53 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk; +Cc: Andrew Cooper, Keir Fraser, Jan Beulich, xen-devel
[-- Attachment #1.1: Type: text/plain, Size: 586 bytes --]
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.
--
Doug Goldstein
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 959 bytes --]
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-02-26 19:53 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-26 3:39 [PATCH 0/4] handful of Kconfig changes Doug Goldstein
2016-02-26 3:39 ` [PATCH 1/4] build: consolidate CONFIG_HAS_VIDEO and CONFIG_VIDEO Doug Goldstein
2016-02-26 11:35 ` Jan Beulich
2016-02-26 3:39 ` [PATCH 2/4] build: consolidate CONFIG_HAS_ACPI and CONFIG_ACPI Doug Goldstein
2016-02-26 3:39 ` [PATCH 3/4] build: convert HAS_NUMA to Kconfig Doug Goldstein
2016-02-26 18:56 ` Konrad Rzeszutek Wilk
2016-02-26 19:53 ` Doug Goldstein
2016-02-26 3:39 ` [PATCH 4/4] build: convert HAS_CORE_PARKING " Doug Goldstein
2016-02-26 9:30 ` [PATCH 0/4] handful of Kconfig changes Jan Beulich
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.