History

Merge tag 'kvm-arm-for-3.13-1' of git://git.linaro.org/people/cdall/linux-kvm-arm into next

Updates for KVM/ARM including cpu=host and Cortex-A7 support

Gleb Natapov committed 13 years ago

Commit d5701422 parents f2e1066 a7265fb16 files · +270 −134Browse files

Showing the changes to include/uapi/linux (1 of 16 files). Show all

Unified · Split

include/uapi/linux/kvm.h+1−0
@@ -1012,6 +1012,7 @@ struct kvm_s390_ucas_mapping { · 1011 unmodified lines
1012/* VM is being stopped by host */1012/* VM is being stopped by host */
1013#define KVM_KVMCLOCK_CTRL _IO(KVMIO, 0xad)1013#define KVM_KVMCLOCK_CTRL _IO(KVMIO, 0xad)
1014#define KVM_ARM_VCPU_INIT _IOW(KVMIO, 0xae, struct kvm_vcpu_init)1014#define KVM_ARM_VCPU_INIT _IOW(KVMIO, 0xae, struct kvm_vcpu_init)
1015#define KVM_ARM_PREFERRED_TARGET _IOR(KVMIO, 0xaf, struct kvm_vcpu_init)
1015#define KVM_GET_REG_LIST _IOWR(KVMIO, 0xb0, struct kvm_reg_list)1016#define KVM_GET_REG_LIST _IOWR(KVMIO, 0xb0, struct kvm_reg_list)
1016 1017
1017#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)1018#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)