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

6cd2f854 · Linus Torvalds <[email protected]> · 2014-09-23 09:13:43 -07:00

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

Commit: 6cd2f85413eef8fe7bcd7c25bf55e7b055fa257c
Parents: 324c7b62 · 95426393

Merge commit. Changes below are compared with the first parent: 324c7b62.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
virt/kvm/arm/vgic-v2.c	modified	+1	−1	View file

virt/kvm/arm/vgic-v2.c

View file

diff --git a/virt/kvm/arm/vgic-v2.c b/virt/kvm/arm/vgic-v2.c
index 01124ef..416baed 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,
 				  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)