diff options
| author | Radim Krčmář | 2016-09-29 16:01:51 +0200 |
|---|---|---|
| committer | Radim Krčmář | 2016-09-29 16:01:51 +0200 |
| commit | 45ca877ad0519a02c22aaff2e2cdf333a1421a0a (patch) | |
| tree | d7abbc767611379f878bf30b8c3b507d4e31982e /arch/arm/include/asm/kvm_host.h | |
| parent | KVM: nVMX: Fix the NMI IDT-vectoring handling (diff) | |
| parent | KVM: arm/arm64: vgic: Don't flush/sync without a working vgic (diff) | |
| download | kernel-qcow2-linux-45ca877ad0519a02c22aaff2e2cdf333a1421a0a.tar.gz kernel-qcow2-linux-45ca877ad0519a02c22aaff2e2cdf333a1421a0a.tar.xz kernel-qcow2-linux-45ca877ad0519a02c22aaff2e2cdf333a1421a0a.zip | |
Merge tag 'kvm-arm-for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into next
KVM/ARM Changes for v4.9
- Various cleanups and removal of redundant code
- Two important fixes for not using an in-kernel irqchip
- A bit of optimizations
- Handle SError exceptions and present them to guests if appropriate
- Proxying of GICV access at EL2 if guest mappings are unsafe
- GICv3 on AArch32 on ARMv8
- Preparations for GICv3 save/restore, including ABI docs
Diffstat (limited to 'arch/arm/include/asm/kvm_host.h')
| -rw-r--r-- | arch/arm/include/asm/kvm_host.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 6ad21f04a922..2d19e02d03fd 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -39,7 +39,12 @@ #include <kvm/arm_vgic.h> + +#ifdef CONFIG_ARM_GIC_V3 +#define KVM_MAX_VCPUS VGIC_V3_MAX_CPUS +#else #define KVM_MAX_VCPUS VGIC_V2_MAX_CPUS +#endif #define KVM_REQ_VCPU_EXIT 8 |