Commit 6cd2f85413eef8fe7bcd7c25bf55e7b055fa257c

Authored by Linus Torvalds

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull another kvm fix from Paolo Bonzini:
 "Another fix for 3.17 arrived at just the wrong time, after I had sent
  yesterday's pull request.  Normally I would have waited for some other
  patches to pile up, but since 3.17 might be short here it is"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  arm/arm64: KVM: Fix unaligned access bug on gicv2 access

Showing 1 changed file Side-by-side Diff

virt/kvm/arm/vgic-v2.c
... ... @@ -71,7 +71,7 @@
71 71 struct vgic_lr lr_desc)
72 72 {
73 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 77 static u64 vgic_v2_get_elrsr(const struct kvm_vcpu *vcpu)