summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-09-23 15:18:02 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2014-09-23 15:18:02 +0200
commit954263938706bf62d36e81b6b49f313390f2ed35 (patch)
treeda33124c5cc0040b0cf83112626525194c20176d /virt
parentf3670394c29ff3730638762c1760fd2f624e6d7b (diff)
parent1f2bb4acc125edc2c06db3ad3e8c699bc075ad52 (diff)
downloadlinux-954263938706bf62d36e81b6b49f313390f2ed35.tar.bz2
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.c2
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,
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)