From: Greg Kroah-Hartman Date: Wed, 4 Mar 2015 18:16:24 +0000 (-0800) Subject: delete 3.10 and 3.14 kvm s390 patch X-Git-Tag: v3.10.71~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fec644134c57ed79d5c500088da26e31f2a5c200;p=thirdparty%2Fkernel%2Fstable-queue.git delete 3.10 and 3.14 kvm s390 patch --- diff --git a/queue-3.10/kvm-s390-floating-irqs-fix-user-triggerable-endless-loop.patch b/queue-3.10/kvm-s390-floating-irqs-fix-user-triggerable-endless-loop.patch deleted file mode 100644 index 7d07cceaa30..00000000000 --- a/queue-3.10/kvm-s390-floating-irqs-fix-user-triggerable-endless-loop.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8e2207cdd087ebb031e9118d1fd0902c6533a5e5 Mon Sep 17 00:00:00 2001 -From: David Hildenbrand -Date: Thu, 15 Jan 2015 17:56:18 +0100 -Subject: KVM: s390: floating irqs: fix user triggerable endless loop - -From: David Hildenbrand - -commit 8e2207cdd087ebb031e9118d1fd0902c6533a5e5 upstream. - -If a vm with no VCPUs is created, the injection of a floating irq -leads to an endless loop in the kernel. - -Let's skip the search for a destination VCPU for a floating irq if no -VCPUs were created. - -Reviewed-by: Dominik Dingel -Reviewed-by: Cornelia Huck -Signed-off-by: David Hildenbrand -Signed-off-by: Christian Borntraeger -Signed-off-by: Greg Kroah-Hartman - ---- - arch/s390/kvm/interrupt.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/arch/s390/kvm/interrupt.c -+++ b/arch/s390/kvm/interrupt.c -@@ -736,6 +736,8 @@ int kvm_s390_inject_vm(struct kvm *kvm, - list_add_tail(&inti->list, &iter->list); - } - atomic_set(&fi->active, 1); -+ if (atomic_read(&kvm->online_vcpus) == 0) -+ goto unlock_fi; - sigcpu = find_first_bit(fi->idle_mask, KVM_MAX_VCPUS); - if (sigcpu == KVM_MAX_VCPUS) { - do { diff --git a/queue-3.10/series b/queue-3.10/series index 47b12b03bd1..811d4f3ee11 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -39,7 +39,6 @@ arm-pxa-add-regulator_has_full_constraints-to-poodle-board-file.patch kdb-fix-incorrect-counts-in-kdb-summary-command-output.patch ntp-fixup-adjtimex-freq-validation-on-32-bit-systems.patch arc-fix-page-address-calculation-if-page_offset-linux_link_base.patch -kvm-s390-floating-irqs-fix-user-triggerable-endless-loop.patch kvm-mips-don-t-leak-fpu-dsp-to-guest.patch kvm-x86-update-masterclock-values-on-tsc-writes.patch hx4700-regulator-declare-full-constraints.patch diff --git a/queue-3.14/kvm-s390-floating-irqs-fix-user-triggerable-endless-loop.patch b/queue-3.14/kvm-s390-floating-irqs-fix-user-triggerable-endless-loop.patch deleted file mode 100644 index 1156a252c91..00000000000 --- a/queue-3.14/kvm-s390-floating-irqs-fix-user-triggerable-endless-loop.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8e2207cdd087ebb031e9118d1fd0902c6533a5e5 Mon Sep 17 00:00:00 2001 -From: David Hildenbrand -Date: Thu, 15 Jan 2015 17:56:18 +0100 -Subject: KVM: s390: floating irqs: fix user triggerable endless loop - -From: David Hildenbrand - -commit 8e2207cdd087ebb031e9118d1fd0902c6533a5e5 upstream. - -If a vm with no VCPUs is created, the injection of a floating irq -leads to an endless loop in the kernel. - -Let's skip the search for a destination VCPU for a floating irq if no -VCPUs were created. - -Reviewed-by: Dominik Dingel -Reviewed-by: Cornelia Huck -Signed-off-by: David Hildenbrand -Signed-off-by: Christian Borntraeger -Signed-off-by: Greg Kroah-Hartman - ---- - arch/s390/kvm/interrupt.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/arch/s390/kvm/interrupt.c -+++ b/arch/s390/kvm/interrupt.c -@@ -739,6 +739,8 @@ int kvm_s390_inject_vm(struct kvm *kvm, - list_add_tail(&inti->list, &iter->list); - } - atomic_set(&fi->active, 1); -+ if (atomic_read(&kvm->online_vcpus) == 0) -+ goto unlock_fi; - sigcpu = find_first_bit(fi->idle_mask, KVM_MAX_VCPUS); - if (sigcpu == KVM_MAX_VCPUS) { - do { diff --git a/queue-3.14/series b/queue-3.14/series index d763564f426..8d8336c0c9c 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -54,7 +54,6 @@ arm-pxa-add-regulator_has_full_constraints-to-poodle-board-file.patch kdb-fix-incorrect-counts-in-kdb-summary-command-output.patch ntp-fixup-adjtimex-freq-validation-on-32-bit-systems.patch arc-fix-page-address-calculation-if-page_offset-linux_link_base.patch -kvm-s390-floating-irqs-fix-user-triggerable-endless-loop.patch kvm-mips-don-t-leak-fpu-dsp-to-guest.patch kvm-x86-update-masterclock-values-on-tsc-writes.patch hx4700-regulator-declare-full-constraints.patch