From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 6 Nov 2015 19:12:26 +0000 (-0800)
Subject: 4.2-stable patches
X-Git-Tag: v3.10.93~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acf2c26e7a1c92bd757cd481ac7aa9c36bcfb917;p=thirdparty%2Fkernel%2Fstable-queue.git

4.2-stable patches

added patches:
	xen-fix-backport-of-previous-kexec-patch.patch
---

diff --git a/queue-4.2/series b/queue-4.2/series
index b5a2fa3b480..950d8c356bc 100644
--- a/queue-4.2/series
+++ b/queue-4.2/series
@@ -107,3 +107,4 @@ drm-vmwgfx-fix-up-user_dmabuf-refcounting.patch
 thp-use-is_zero_pfn-only-after-pte_present-check.patch
 pinctrl-baytrail-serialize-all-register-access.patch
 pinctrl-baytrail-use-raw_spinlock-for-locking.patch
+xen-fix-backport-of-previous-kexec-patch.patch
diff --git a/queue-4.2/xen-fix-backport-of-previous-kexec-patch.patch b/queue-4.2/xen-fix-backport-of-previous-kexec-patch.patch
new file mode 100644
index 00000000000..5e903dcafec
--- /dev/null
+++ b/queue-4.2/xen-fix-backport-of-previous-kexec-patch.patch
@@ -0,0 +1,50 @@
+From foo@baz Fri Nov  6 11:07:07 PST 2015
+Date: Fri, 06 Nov 2015 11:07:07 -0800
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: xen: fix backport of previous kexec patch
+
+Fixes the backport of 0b34a166f291d255755be46e43ed5497cdd194f2 upstream
+
+Commit 0b34a166f291d255755be46e43ed5497cdd194f2 "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: David Vrabel <david.vrabel@citrix.com>
+Reported-by: Luis Henriques <luis.henriques@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/xen/enlighten.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/x86/xen/enlighten.c
++++ b/arch/x86/xen/enlighten.c
+@@ -33,7 +33,7 @@
+ #include <linux/memblock.h>
+ #include <linux/edd.h>
+ 
+-#ifdef CONFIG_KEXEC_CORE
++#ifdef CONFIG_KEXEC
+ #include <linux/kexec.h>
+ #endif
+ 
+@@ -1804,7 +1804,7 @@ static struct notifier_block xen_hvm_cpu
+ 	.notifier_call	= xen_hvm_cpu_notify,
+ };
+ 
+-#ifdef CONFIG_KEXEC_CORE
++#ifdef CONFIG_KEXEC
+ static void xen_hvm_shutdown(void)
+ {
+ 	native_machine_shutdown();
+@@ -1838,7 +1838,7 @@ static void __init xen_hvm_guest_init(vo
+ 	x86_init.irqs.intr_init = xen_init_IRQ;
+ 	xen_hvm_init_time_ops();
+ 	xen_hvm_init_mmu_ops();
+-#ifdef CONFIG_KEXEC_CORE
++#ifdef CONFIG_KEXEC
+ 	machine_ops.shutdown = xen_hvm_shutdown;
+ 	machine_ops.crash_shutdown = xen_hvm_crash_shutdown;
+ #endif