diff options
| author | Christoffer Dall <cdall@linaro.org> | 2017-05-02 14:41:02 +0300 |
|---|---|---|
| committer | Christoffer Dall <cdall@linaro.org> | 2017-06-08 17:59:44 +0300 |
| commit | a2befacf50940017e0de8461c4b924a929c4edc5 (patch) | |
| tree | aa53d740e25468b943b0d89d0b51cd3a35d9ca75 /virt/kvm/arm/arm.c | |
| parent | 1b6502e5bc5ef16179bcd812dfa43d8bbb5689d4 (diff) | |
| download | linux-a2befacf50940017e0de8461c4b924a929c4edc5.tar.xz | |
KVM: arm64: Allow creating the PMU without the in-kernel GIC
Since we got support for devices in userspace which allows reporting the
PMU overflow output status to userspace, we should actually allow
creating the PMU on systems without an in-kernel irqchip, which in turn
requires us to slightly clarify error codes for the ABI and move things
around for the initialization phase.
Signed-off-by: Christoffer Dall <cdall@linaro.org>
Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'virt/kvm/arm/arm.c')
| -rw-r--r-- | virt/kvm/arm/arm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index cac5c2f2ddba..72816d3f23a7 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -527,6 +527,10 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu) } ret = kvm_timer_enable(vcpu); + if (ret) + return ret; + + ret = kvm_arm_pmu_v3_enable(vcpu); return ret; } |