summaryrefslogtreecommitdiff
path: root/arch/arm64/include/uapi
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2013-12-28 10:29:37 +0000
committerMarc Zyngier <marc.zyngier@arm.com>2013-12-28 10:29:37 +0000
commitda91747cda0fdbaa05b80becb5cecfac35c8de36 (patch)
tree664d9ae407eb5f80c685e5a0a5035d053dadbe1c /arch/arm64/include/uapi
parent60dd133a7b77b6adc2d18ff1a85db5a67434a071 (diff)
parente5cf9dcdbfd26cd4e1991db08755da900454efeb (diff)
downloadlinux-da91747cda0fdbaa05b80becb5cecfac35c8de36.tar.gz
Merge branch 'kvm-arm64/for-3.14' into kvm-arm64/next
Diffstat (limited to 'arch/arm64/include/uapi')
-rw-r--r--arch/arm64/include/uapi/asm/kvm.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h
index 7c25ca8b02b3..495ab6f84a61 100644
--- a/arch/arm64/include/uapi/asm/kvm.h
+++ b/arch/arm64/include/uapi/asm/kvm.h
@@ -55,8 +55,9 @@ struct kvm_regs {
#define KVM_ARM_TARGET_AEM_V8 0
#define KVM_ARM_TARGET_FOUNDATION_V8 1
#define KVM_ARM_TARGET_CORTEX_A57 2
+#define KVM_ARM_TARGET_XGENE_POTENZA 3
-#define KVM_ARM_NUM_TARGETS 3
+#define KVM_ARM_NUM_TARGETS 4
/* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */
#define KVM_ARM_DEVICE_TYPE_SHIFT 0