diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2017-08-03 17:59:58 +0200 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-08-03 17:59:58 +0200 |
| commit | 53a5abd8392e5f6e5b134fe47eb9f2400256d93e (patch) | |
| tree | 5a71da612d71c3808cc70da6255221d74c942187 /arch | |
| parent | 6550c4df7e50d09f86385ce20fd7e969a5638da3 (diff) | |
| parent | 3af4e414af5ce014d1f88cd816d997048298b310 (diff) | |
| download | linux-53a5abd8392e5f6e5b134fe47eb9f2400256d93e.tar.bz2 | |
Merge tag 'kvm-arm-for-v4.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
KVM/ARM Fixes for v4.13-rc4
- Yet another race with VM destruction plugged
- A set of small vgic fixes
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kvm/sys_regs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 77862881ae86..2e070d3baf9f 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -764,7 +764,7 @@ static bool access_pmovs(struct kvm_vcpu *vcpu, struct sys_reg_params *p, if (p->is_write) { if (r->CRm & 0x2) /* accessing PMOVSSET_EL0 */ - kvm_pmu_overflow_set(vcpu, p->regval & mask); + vcpu_sys_reg(vcpu, PMOVSSET_EL0) |= (p->regval & mask); else /* accessing PMOVSCLR_EL0 */ vcpu_sys_reg(vcpu, PMOVSSET_EL0) &= ~(p->regval & mask); |