diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-09-23 09:18:02 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-09-23 09:18:02 -0400 |
| commit | 954263938706bf62d36e81b6b49f313390f2ed35 (patch) | |
| tree | da33124c5cc0040b0cf83112626525194c20176d /virt | |
| parent | f3670394c29ff3730638762c1760fd2f624e6d7b (diff) | |
| parent | 1f2bb4acc125edc2c06db3ad3e8c699bc075ad52 (diff) | |
Merge tag 'kvm-arm-for-v3.17-rc7-or-final' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
Fixes unaligned access to the gicv2 virtual cpu status.
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/arm/vgic-v2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/arm/vgic-v2.c b/virt/kvm/arm/vgic-v2.c index 01124ef3690a..416baedfc89f 100644 --- a/virt/kvm/arm/vgic-v2.c +++ b/virt/kvm/arm/vgic-v2.c | |||
| @@ -71,7 +71,7 @@ static void vgic_v2_sync_lr_elrsr(struct kvm_vcpu *vcpu, int lr, | |||
| 71 | struct vgic_lr lr_desc) | 71 | struct vgic_lr lr_desc) |
| 72 | { | 72 | { |
| 73 | if (!(lr_desc.state & LR_STATE_MASK)) | 73 | if (!(lr_desc.state & LR_STATE_MASK)) |
| 74 | set_bit(lr, (unsigned long *)vcpu->arch.vgic_cpu.vgic_v2.vgic_elrsr); | 74 | __set_bit(lr, (unsigned long *)vcpu->arch.vgic_cpu.vgic_v2.vgic_elrsr); |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | static u64 vgic_v2_get_elrsr(const struct kvm_vcpu *vcpu) | 77 | static u64 vgic_v2_get_elrsr(const struct kvm_vcpu *vcpu) |