diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-04 10:05:53 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-04 10:05:53 -0400 |
| commit | 302992b7e2baa8c9e1f3786b5c5f0e5db62e53e2 (patch) | |
| tree | 45af34db634e2f7a376ecb11a12c8d95f3a1c30e | |
| parent | 8b9c5befaaca1197d36f0e6654ae952e9cbff4f5 (diff) | |
| download | longterm-queue-4.12-302992b7e2baa8c9e1f3786b5c5f0e5db62e53e2.tar.gz | |
arm64: drop KVM vgis patch n/a to 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/KVM-arm-arm64-vgic-its-Preserve-the-revious-read-fro.patch | 45 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 46 deletions
diff --git a/queue/KVM-arm-arm64-vgic-its-Preserve-the-revious-read-fro.patch b/queue/KVM-arm-arm64-vgic-its-Preserve-the-revious-read-fro.patch deleted file mode 100644 index 54692e6..0000000 --- a/queue/KVM-arm-arm64-vgic-its-Preserve-the-revious-read-fro.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 64afe6e9eb4841f35317da4393de21a047a883b3 Mon Sep 17 00:00:00 2001 -From: Marc Zyngier <marc.zyngier@arm.com> -Date: Thu, 16 Nov 2017 17:58:17 +0000 -Subject: [PATCH] KVM: arm/arm64: vgic-its: Preserve the revious read from the - pending table - -commit 64afe6e9eb4841f35317da4393de21a047a883b3 upstream. - -The current pending table parsing code assumes that we keep the -previous read of the pending bits, but keep that variable in -the current block, making sure it is discarded on each loop. - -We end-up using whatever is on the stack. Who knows, it might -just be the right thing... - -Fixes: 33d3bc9556a7d ("KVM: arm64: vgic-its: Read initial LPI pending table") -Cc: stable@vger.kernel.org # 4.8 -Reported-by: AKASHI Takahiro <takahiro.akashi@linaro.org> -Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org> -Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> -Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> - -diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c -index 1f761a9991e7..cb2d0a2dbe5a 100644 ---- a/virt/kvm/arm/vgic/vgic-its.c -+++ b/virt/kvm/arm/vgic/vgic-its.c -@@ -421,6 +421,7 @@ static int its_sync_lpi_pending_table(struct kvm_vcpu *vcpu) - u32 *intids; - int nr_irqs, i; - unsigned long flags; -+ u8 pendmask; - - nr_irqs = vgic_copy_lpi_list(vcpu, &intids); - if (nr_irqs < 0) -@@ -428,7 +429,6 @@ static int its_sync_lpi_pending_table(struct kvm_vcpu *vcpu) - - for (i = 0; i < nr_irqs; i++) { - int byte_offset, bit_nr; -- u8 pendmask; - - byte_offset = intids[i] / BITS_PER_BYTE; - bit_nr = intids[i] % BITS_PER_BYTE; --- -2.15.0 - diff --git a/queue/series b/queue/series index 0798c3c..e9cc948 100644 --- a/queue/series +++ b/queue/series @@ -107,7 +107,6 @@ md-free-unused-memory-after-bitmap-resize.patch RDMA-cxgb4-Annotate-r2-and-stag-as-__be32.patch fix-kcm_clone.patch ipmi-Stop-timers-before-cleaning-up-the-module.patch -KVM-arm-arm64-vgic-its-Preserve-the-revious-read-fro.patch usb-gadget-ffs-Forbid-usb_ep_alloc_request-from-slee.patch audit-Allow-auditd-to-set-pid-to-0-to-end-auditing.patch audit-ensure-that-audit-1-actually-enables-audit-for.patch |