summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2013-10-16 12:30:32 (GMT)
committerGleb Natapov <gleb@redhat.com>2013-10-16 12:30:32 (GMT)
commitd570142674890fe10b3d7d86aa105e3dfce1ddfa (patch)
tree8a681c3cd9e21400773e24b32f8849d0f25cf4e7 /include
parentf2e106692d5189303997ad7b96de8d8123aa5613 (diff)
parenta7265fb1751ffbfad553afc7f592a6dac6be48de (diff)
downloadlinux-fsl-qoriq-d570142674890fe10b3d7d86aa105e3dfce1ddfa.tar.xz
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
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/kvm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 99c2533..e32e776 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -1012,6 +1012,7 @@ struct kvm_s390_ucas_mapping {
/* VM is being stopped by host */
#define KVM_KVMCLOCK_CTRL _IO(KVMIO, 0xad)
#define KVM_ARM_VCPU_INIT _IOW(KVMIO, 0xae, struct kvm_vcpu_init)
+#define KVM_ARM_PREFERRED_TARGET _IOR(KVMIO, 0xaf, struct kvm_vcpu_init)
#define KVM_GET_REG_LIST _IOWR(KVMIO, 0xb0, struct kvm_reg_list)
#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)