diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-12-28 05:29:37 -0500 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-12-28 05:29:37 -0500 |
| commit | da91747cda0fdbaa05b80becb5cecfac35c8de36 (patch) | |
| tree | 664d9ae407eb5f80c685e5a0a5035d053dadbe1c /arch/arm64/include/uapi/asm | |
| parent | 60dd133a7b77b6adc2d18ff1a85db5a67434a071 (diff) | |
| parent | e5cf9dcdbfd26cd4e1991db08755da900454efeb (diff) | |
Merge branch 'kvm-arm64/for-3.14' into kvm-arm64/next
Diffstat (limited to 'arch/arm64/include/uapi/asm')
| -rw-r--r-- | arch/arm64/include/uapi/asm/kvm.h | 3 |
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 { | |||
| 55 | #define KVM_ARM_TARGET_AEM_V8 0 | 55 | #define KVM_ARM_TARGET_AEM_V8 0 |
| 56 | #define KVM_ARM_TARGET_FOUNDATION_V8 1 | 56 | #define KVM_ARM_TARGET_FOUNDATION_V8 1 |
| 57 | #define KVM_ARM_TARGET_CORTEX_A57 2 | 57 | #define KVM_ARM_TARGET_CORTEX_A57 2 |
| 58 | #define KVM_ARM_TARGET_XGENE_POTENZA 3 | ||
| 58 | 59 | ||
| 59 | #define KVM_ARM_NUM_TARGETS 3 | 60 | #define KVM_ARM_NUM_TARGETS 4 |
| 60 | 61 | ||
| 61 | /* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */ | 62 | /* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */ |
| 62 | #define KVM_ARM_DEVICE_TYPE_SHIFT 0 | 63 | #define KVM_ARM_DEVICE_TYPE_SHIFT 0 |