diff options
author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2012-02-09 11:33:28 +0000 |
---|---|---|
committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2012-02-09 11:33:28 +0000 |
commit | 4e60158364638028e95855b5fdfd8e68cd70b225 (patch) | |
tree | 473cc8da58a7041b67de5162b01e03c023a80174 /xen/drivers/char/console.c | |
parent | 3487e40ba447dcff5d303cb68350b7879692185b (diff) | |
download | xen-4e60158364638028e95855b5fdfd8e68cd70b225.tar.gz xen-4e60158364638028e95855b5fdfd8e68cd70b225.tar.bz2 xen-4e60158364638028e95855b5fdfd8e68cd70b225.zip |
xen/common/Makefile: introduce HAS_{CPUFREQ,PCI,PASSTHROUGH,NS16550,KEXEC}
- make the compilation of ns16550.c depend upon HAS_NS16550;
- make the compilation of cpufreq depend upon HAS_CPUFREQ;
- make the compilation of pci depend upon HAS_PCI;
- make the compilation of passthrough depend upon HAS_PASSTHROUGH;
- make the compilation of kexec depend upon HAS_KEXEC.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
---
xen/arch/ia64/Rules.mk | 5 +++++
xen/arch/x86/Rules.mk | 5 +++++
xen/common/Makefile | 2 +-
xen/common/shutdown.c | 4 ++++
xen/drivers/Makefile | 6 +++---
xen/drivers/char/Makefile | 2 +-
xen/drivers/char/console.c | 4 ++++
xen/include/asm-ia64/config.h | 1 +
xen/include/asm-x86/config.h | 1 +
9 files changed, 25 insertions(+), 5 deletions(-)
Diffstat (limited to 'xen/drivers/char/console.c')
-rw-r--r-- | xen/drivers/char/console.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index dc9b9c58cd..64a99a67f6 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -22,7 +22,9 @@ #include <xen/guest_access.h> #include <xen/shutdown.h> #include <xen/vga.h> +#ifdef CONFIG_KEXEC #include <xen/kexec.h> +#endif #include <asm/debugger.h> #include <asm/div64.h> #include <xen/hypercall.h> /* for do_console_io */ @@ -963,7 +965,9 @@ void panic(const char *fmt, ...) debugger_trap_immediate(); +#ifdef CONFIG_KEXEC kexec_crash(); +#endif if ( opt_noreboot ) { |