Skip to contentSkip to conversation

Patch "xen: fix backport of previous kexec patch" has been added to the 3.10-stable tree

PATCH [email protected] 1 participant 1 message Nov 6, 2015

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

xen: fix backport of previous kexec patch

to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
xen-fix-backport-of-previous-kexec-patch.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Fri Nov 6 11:07:07 PST 2015

Date: Fri, 06 Nov 2015 11:07:07 -0800
To: Greg KH <[email protected]>
From: Greg Kroah-Hartman <[email protected]>
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.

---
 arch/x86/xen/enlighten.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/xen/enlighten.c +3 -3
@@ -33,7 +33,7 @@
 #include <linux/memblock.h>
 #include <linux/edd.h>
 
-#ifdef CONFIG_KEXEC_CORE
+#ifdef CONFIG_KEXEC
 #include <linux/kexec.h>
 #endif
 
@@ -1748,7 +1748,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();
@@ -1777,7 +1777,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

Patches currently in stable-queue which might be from [email protected] are

queue-3.10/xen-fix-backport-of-previous-kexec-patch.patch queue-3.10/xen-blkfront-check-for-null-drvdata-in-blkback_changed-xenbusstateclosing.patch queue-3.10/iwlwifi-dvm-fix-d3-firmware-pn-programming.patch queue-3.10/mm-make-sendfile-2-killable.patch queue-3.10/dm-btree-fix-leak-of-bufio-backed-block-in-btree_split_beneath-error-path.patch queue-3.10/drm-nouveau-gem-return-only-valid-domain-when-there-s-only-one.patch queue-3.10/crypto-api-only-abort-operations-on-fatal-signal.patch queue-3.10/md-raid1-submit_bio_wait-returns-0-on-success.patch queue-3.10/revert-arm64-unwind-fix-pc-calculation.patch queue-3.10/asoc-wm8904-correct-number-of-eq-registers.patch queue-3.10/mvsas-fix-null-pointer-dereference-in-mvs_slot_task_free.patch queue-3.10/ath9k-declare-required-extra-tx-headroom.patch queue-3.10/x86-setup-extend-low-identity-map-to-cover-whole-kernel-range.patch queue-3.10/md-raid10-submit_bio_wait-returns-0-on-success.patch queue-3.10/xhci-handle-no-ping-response-error-properly.patch queue-3.10/rbd-prevent-kernel-stack-blow-up-on-rbd-map.patch queue-3.10/iommu-amd-don-t-clear-dte-flags-when-modifying-it.patch queue-3.10/powerpc-rtas-validate-rtas.entry-before-calling-enter_rtas.patch queue-3.10/ib-cm-fix-rb-tree-duplicate-free-and-use-after-free.patch queue-3.10/iwlwifi-mvm-fix-d3-firmware-pn-programming.patch queue-3.10/module-fix-locking-in-symbol_put_addr.patch queue-3.10/dm-btree-remove-fix-a-bug-when-rebalancing-nodes-after-removal.patch queue-3.10/rbd-require-stable-pages-if-message-data-crcs-are-enabled.patch queue-3.10/rbd-don-t-leak-parent_spec-in-rbd_dev_probe_parent.patch