Commit e4338aef authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

xen: fix backport of previous kexec patch

Fixes the backport of 0b34a166 upstream

Commit 0b34a166 "x86/xen: Support
kexec/kdump in HVM guests by doing a soft reset" has been added to the
4.2-stable tree" needed to correct the CONFIG variable, as
CONFIG_KEXEC_CORE only showed up in 4.3.
Reported-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
Reported-by: default avatarLuis Henriques <luis.henriques@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cdfdd2ea
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <linux/memblock.h> #include <linux/memblock.h>
#include <linux/edd.h> #include <linux/edd.h>
#ifdef CONFIG_KEXEC_CORE #ifdef CONFIG_KEXEC
#include <linux/kexec.h> #include <linux/kexec.h>
#endif #endif
...@@ -1802,7 +1802,7 @@ static struct notifier_block xen_hvm_cpu_notifier = { ...@@ -1802,7 +1802,7 @@ static struct notifier_block xen_hvm_cpu_notifier = {
.notifier_call = xen_hvm_cpu_notify, .notifier_call = xen_hvm_cpu_notify,
}; };
#ifdef CONFIG_KEXEC_CORE #ifdef CONFIG_KEXEC
static void xen_hvm_shutdown(void) static void xen_hvm_shutdown(void)
{ {
native_machine_shutdown(); native_machine_shutdown();
...@@ -1836,7 +1836,7 @@ static void __init xen_hvm_guest_init(void) ...@@ -1836,7 +1836,7 @@ static void __init xen_hvm_guest_init(void)
x86_init.irqs.intr_init = xen_init_IRQ; x86_init.irqs.intr_init = xen_init_IRQ;
xen_hvm_init_time_ops(); xen_hvm_init_time_ops();
xen_hvm_init_mmu_ops(); xen_hvm_init_mmu_ops();
#ifdef CONFIG_KEXEC_CORE #ifdef CONFIG_KEXEC
machine_ops.shutdown = xen_hvm_shutdown; machine_ops.shutdown = xen_hvm_shutdown;
machine_ops.crash_shutdown = xen_hvm_crash_shutdown; machine_ops.crash_shutdown = xen_hvm_crash_shutdown;
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment