diff options
author | Gleb Natapov <gleb@redhat.com> | 2013-10-16 16:30:32 +0400 |
---|---|---|
committer | Gleb Natapov <gleb@redhat.com> | 2013-10-16 16:30:32 +0400 |
commit | d570142674890fe10b3d7d86aa105e3dfce1ddfa (patch) | |
tree | 8a681c3cd9e21400773e24b32f8849d0f25cf4e7 /arch/arm/include/uapi/asm/kvm.h | |
parent | f2e106692d5189303997ad7b96de8d8123aa5613 (diff) | |
parent | a7265fb1751ffbfad553afc7f592a6dac6be48de (diff) | |
download | linux-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 'arch/arm/include/uapi/asm/kvm.h')
-rw-r--r-- | arch/arm/include/uapi/asm/kvm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/uapi/asm/kvm.h b/arch/arm/include/uapi/asm/kvm.h index c1ee007523d7..c498b60c0505 100644 --- a/arch/arm/include/uapi/asm/kvm.h +++ b/arch/arm/include/uapi/asm/kvm.h @@ -63,7 +63,8 @@ struct kvm_regs { /* Supported Processor Types */ #define KVM_ARM_TARGET_CORTEX_A15 0 -#define KVM_ARM_NUM_TARGETS 1 +#define KVM_ARM_TARGET_CORTEX_A7 1 +#define KVM_ARM_NUM_TARGETS 2 /* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */ #define KVM_ARM_DEVICE_TYPE_SHIFT 0 |