Commit 95426393 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-arm-for-v3.17-rc7-or-final' of... 

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.
parents f3670394 1f2bb4ac

virt/kvm/arm/vgic-v2.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static void vgic_v2_sync_lr_elrsr(struct kvm_vcpu *vcpu, int lr, 
				  struct vgic_lr lr_desc)

{

	if (!(lr_desc.state & LR_STATE_MASK))

		set_bit(lr, (unsigned long *)vcpu->arch.vgic_cpu.vgic_v2.vgic_elrsr);

		__set_bit(lr, (unsigned long *)vcpu->arch.vgic_cpu.vgic_v2.vgic_elrsr);

}



static u64 vgic_v2_get_elrsr(const struct kvm_vcpu *vcpu)