From 50867eab46bd4d9d473c4ac27e4e7244671a55cc Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 4 Feb 2014 11:36:56 -0800 Subject: [PATCH] remove queue-3.4/kvm-s390-fix-diagnose-code-extraction.patch --- ...vm-s390-fix-diagnose-code-extraction.patch | 34 ------------------- queue-3.4/series | 1 - 2 files changed, 35 deletions(-) delete mode 100644 queue-3.4/kvm-s390-fix-diagnose-code-extraction.patch diff --git a/queue-3.4/kvm-s390-fix-diagnose-code-extraction.patch b/queue-3.4/kvm-s390-fix-diagnose-code-extraction.patch deleted file mode 100644 index 35289ae6b9f..00000000000 --- a/queue-3.4/kvm-s390-fix-diagnose-code-extraction.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 743db27c526e0f31cc507959d662e97e2048a86f Mon Sep 17 00:00:00 2001 -From: Heiko Carstens -Date: Mon, 11 Nov 2013 13:56:47 +0100 -Subject: KVM: s390: fix diagnose code extraction - -From: Heiko Carstens - -commit 743db27c526e0f31cc507959d662e97e2048a86f upstream. - -The diagnose code to be used is the contents of the base register (if not -zero), plus the displacement. The current code ignores the base register -contents. So let's fix that... - -Reviewed-by: Cornelia Huck -Cc: stable@vger.kernel.org -Signed-off-by: Heiko Carstens -Signed-off-by: Cornelia Huck -Signed-off-by: Greg Kroah-Hartman - ---- - arch/s390/kvm/diag.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/s390/kvm/diag.c -+++ b/arch/s390/kvm/diag.c -@@ -82,7 +82,7 @@ static int __diag_ipl_functions(struct k - - int kvm_s390_handle_diag(struct kvm_vcpu *vcpu) - { -- int code = (vcpu->arch.sie_block->ipb & 0xfff0000) >> 16; -+ int code = kvm_s390_get_base_disp_rs(vcpu) & 0xffff; - - switch (code) { - case 0x10: diff --git a/queue-3.4/series b/queue-3.4/series index 5e8a86ca2a3..b129e89ce4a 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -19,7 +19,6 @@ staging-vt6656-bbvupdatepreedthreshold-always-set-sensitivity-on-bscanning.patch tty-serial-at91-handle-shutdown-more-safely.patch arm-at91-smc-bug-fix-in-sam9_smc_cs_read.patch serial-add-support-for-200-v3-series-titan-card.patch -kvm-s390-fix-diagnose-code-extraction.patch parport-parport_pc-remove-double-pci-id-for-netmos.patch rtc-cmos-add-an-alarm-disable-quirk.patch asoc-adau1701-fix-adau1701_seroctl_word_len_16-constant.patch -- 2.47.2