diff options
| author |   Marc Zyngier <maz@kernel.org> | 2019-10-24 15:04:09 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2019-10-24 15:04:09 +0100 |
| commit | a4b28f5c67983d92c911ca1404728bc4ea958c0e (patch) | |
| tree | 9e33ce5332ee983a7424fe6146f91f2f4f551a15 /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-dev-a4b28f5c67983d92c911ca1404728bc4ea958c0e.tar.xz linux-dev-a4b28f5c67983d92c911ca1404728bc4ea958c0e.zip | |
Merge remote-tracking branch 'kvmarm/kvm-arm64/stolen-time' into kvmarm-master/next
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/kvm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 65db5a4257ec..fb47c0fad6a6 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1235,6 +1235,8 @@ enum kvm_device_type { #define KVM_DEV_TYPE_ARM_VGIC_ITS KVM_DEV_TYPE_ARM_VGIC_ITS KVM_DEV_TYPE_XIVE, #define KVM_DEV_TYPE_XIVE KVM_DEV_TYPE_XIVE + KVM_DEV_TYPE_ARM_PV_TIME, +#define KVM_DEV_TYPE_ARM_PV_TIME KVM_DEV_TYPE_ARM_PV_TIME KVM_DEV_TYPE_MAX, }; |