Replace kexec := y in Rules.mk with a Kconfig option called CONFIG_KEXEC
CC: Ian Campbell <ian.campb...@citrix.com>
CC: Ian Jackson <ian.jack...@eu.citrix.com>
CC: Jan Beulich <jbeul...@suse.com>
CC: Keir Fraser <k...@xen.org>
CC: Tim Deegan <t...@xen.org>
Signed-off-by: Doug Goldstein <car...@cardoe.com>
---
xen/Rules.mk | 6 ------
xen/common/Kconfig | 12 ++++++++++++
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/xen/Rules.mk b/xen/Rules.mk
index 1999ff5..e31be35 100644
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -10,7 +10,6 @@ lock_profile ?= n
crash_debug ?= n
frame_pointer ?= n
lto ?= n
-kexec ?= y
-include $(BASEDIR)/include/config/auto.conf
@@ -65,11 +64,6 @@ ifneq ($(max_phys_irqs),)
CFLAGS-y += -DMAX_PHYS_IRQS=$(max_phys_irqs)
endif
-CONFIG_KEXEC-$(CONFIG_HAS_KEXEC) := $(kexec)
-CONFIG_KEXEC := $(CONFIG_KEXEC-y)
-
-CFLAGS-$(CONFIG_KEXEC) += -DCONFIG_KEXEC
-
AFLAGS-y += -D__ASSEMBLY__ -include
$(BASEDIR)/include/xen/config.h
# Clang's built-in assembler can't handle .code16/.code32/.code64 yet
diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index 58858d2..d46f95f 100644
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -29,4 +29,16 @@ config HAS_KEXEC
config HAS_GDBSX
bool
+# Enable/Disable kexec support
+config KEXEC
+ bool "kexec support"
+ default y
+ depends on HAS_KEXEC
+ ---help---
+ Allows a running Xen hypervisor to be replaced with another OS
+ without rebooting. This is primarily used to execute a crash
+ environment to collect information on a Xen hypervisor or dom0 crash.
+
+ If unsure, say Y.
+
endmenu
--
2.4.10
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
