diff options
| author | Geoff Levand <geoff@infradead.org> | 2013-06-06 18:02:54 -0700 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2013-06-26 10:50:05 -0700 |
| commit | f2dda9d829818b055510187059cdfa4ece10c82d (patch) | |
| tree | 9644cf80a75fb32131a5bba5595e478c1a49673a /arch/arm/kvm | |
| parent | 22cfbb6d730ca2fda236b507d9fba17bf002736c (diff) | |
| download | linux-f2dda9d829818b055510187059cdfa4ece10c82d.tar.gz linux-f2dda9d829818b055510187059cdfa4ece10c82d.tar.bz2 linux-f2dda9d829818b055510187059cdfa4ece10c82d.zip | |
arm/kvm: Cleanup KVM_ARM_MAX_VCPUS logic
Commit d21a1c83c7595e387545632e44cd7797b76e19cc (ARM: KVM: define KVM_ARM_MAX_VCPUS
unconditionally) changed the Kconfig logic for KVM_ARM_MAX_VCPUS to work around a
build error arising from the use of KVM_ARM_MAX_VCPUS when CONFIG_KVM=n. The
resulting Kconfig logic is a bit awkward and leaves a KVM_ARM_MAX_VCPUS always
defined in the kernel config file.
This change reverts the Kconfig logic back and adds a simple preprocessor
conditional in kvm_host.h to handle when CONFIG_KVM_ARM_MAX_VCPUS is undefined.
Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'arch/arm/kvm')
| -rw-r--r-- | arch/arm/kvm/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig index 370e1a8af6ac..49dd64e579c2 100644 --- a/arch/arm/kvm/Kconfig +++ b/arch/arm/kvm/Kconfig @@ -41,9 +41,9 @@ config KVM_ARM_HOST Provides host support for ARM processors. config KVM_ARM_MAX_VCPUS - int "Number maximum supported virtual CPUs per VM" if KVM_ARM_HOST - default 4 if KVM_ARM_HOST - default 0 + int "Number maximum supported virtual CPUs per VM" + depends on KVM_ARM_HOST + default 4 help Static number of max supported virtual CPUs per VM. |