diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-12-27 09:02:02 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-12-27 09:02:02 +0100 |
commit | 7ad3423ebb02f340671f70a916bdc8dbec7573ee (patch) | |
tree | b9168d363c24f2af2626e63011ec1f6c81e81d09 /virt/kvm/arm/vgic/vgic-v3.c | |
parent | 56a23ee52611ca76421f3d7cac100e1616716dae (diff) | |
parent | 44be77c590f381bc629815ac789b8b15ecc4ddcf (diff) | |
download | talos-op-linux-7ad3423ebb02f340671f70a916bdc8dbec7573ee.tar.gz talos-op-linux-7ad3423ebb02f340671f70a916bdc8dbec7573ee.zip |
Merge branch 'for-linus' into for-next
Back-merge the upstream branch for applying further cleanup patches
for HD-Audio.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'virt/kvm/arm/vgic/vgic-v3.c')
-rw-r--r-- | virt/kvm/arm/vgic/vgic-v3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c index 2f05f732d3fd..f47e8481fa45 100644 --- a/virt/kvm/arm/vgic/vgic-v3.c +++ b/virt/kvm/arm/vgic/vgic-v3.c @@ -327,13 +327,13 @@ int vgic_v3_save_pending_tables(struct kvm *kvm) int last_byte_offset = -1; struct vgic_irq *irq; int ret; + u8 val; list_for_each_entry(irq, &dist->lpi_list_head, lpi_list) { int byte_offset, bit_nr; struct kvm_vcpu *vcpu; gpa_t pendbase, ptr; bool stored; - u8 val; vcpu = irq->target_vcpu; if (!vcpu) |