diff options
| author | Marc Zyngier <maz@kernel.org> | 2019-10-24 16:04:09 +0200 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2019-10-24 16:04:09 +0200 |
| commit | a4b28f5c67983d92c911ca1404728bc4ea958c0e (patch) | |
| tree | 9e33ce5332ee983a7424fe6146f91f2f4f551a15 /arch/arm64/include/uapi | |
| parent | KVM: arm/arm64: Allow user injection of external data aborts (diff) | |
| parent | KVM: arm64: Select TASK_DELAY_ACCT+TASKSTATS rather than SCHEDSTATS (diff) | |
| download | linux-a4b28f5c67983d92c911ca1404728bc4ea958c0e.tar.xz linux-a4b28f5c67983d92c911ca1404728bc4ea958c0e.zip | |
Merge remote-tracking branch 'kvmarm/kvm-arm64/stolen-time' into kvmarm-master/next
Diffstat (limited to 'arch/arm64/include/uapi')
| -rw-r--r-- | arch/arm64/include/uapi/asm/kvm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h index d49c17a80491..820e5751ada7 100644 --- a/arch/arm64/include/uapi/asm/kvm.h +++ b/arch/arm64/include/uapi/asm/kvm.h @@ -324,6 +324,8 @@ struct kvm_vcpu_events { #define KVM_ARM_VCPU_TIMER_CTRL 1 #define KVM_ARM_VCPU_TIMER_IRQ_VTIMER 0 #define KVM_ARM_VCPU_TIMER_IRQ_PTIMER 1 +#define KVM_ARM_VCPU_PVTIME_CTRL 2 +#define KVM_ARM_VCPU_PVTIME_IPA 0 /* KVM_IRQ_LINE irq field index values */ #define KVM_ARM_IRQ_VCPU2_SHIFT 28 |