diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-12-28 10:29:37 +0000 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-12-28 10:29:37 +0000 |
| commit | da91747cda0fdbaa05b80becb5cecfac35c8de36 (patch) | |
| tree | 664d9ae407eb5f80c685e5a0a5035d053dadbe1c /arch/arm64/include/asm/kvm_host.h | |
| parent | 60dd133a7b77b6adc2d18ff1a85db5a67434a071 (diff) | |
| parent | e5cf9dcdbfd26cd4e1991db08755da900454efeb (diff) | |
Merge branch 'kvm-arm64/for-3.14' into kvm-arm64/nextkvm-arm64/next-3.14-1
Diffstat (limited to 'arch/arm64/include/asm/kvm_host.h')
| -rw-r--r-- | arch/arm64/include/asm/kvm_host.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 5d85a02d1231..0a1d69751562 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -26,7 +26,12 @@ #include <asm/kvm_asm.h> #include <asm/kvm_mmio.h> -#define KVM_MAX_VCPUS 4 +#if defined(CONFIG_KVM_ARM_MAX_VCPUS) +#define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS +#else +#define KVM_MAX_VCPUS 0 +#endif + #define KVM_USER_MEM_SLOTS 32 #define KVM_PRIVATE_MEM_SLOTS 4 #define KVM_COALESCED_MMIO_PAGE_OFFSET 1 |