]> git.baikalelectronics.ru Git - kernel.git/commit
arm/kvm: Cleanup KVM_ARM_MAX_VCPUS logic
authorGeoff Levand <geoff@infradead.org>
Fri, 7 Jun 2013 01:02:54 +0000 (18:02 -0700)
committerChristoffer Dall <christoffer.dall@linaro.org>
Wed, 26 Jun 2013 17:50:05 +0000 (10:50 -0700)
commit5960cc6a5ab216d1482106af08ef7094c15a21bc
tree9644cf80a75fb32131a5bba5595e478c1a49673a
parent47eace68d000ff9dc950e6170978afbf01b8fe47
arm/kvm: Cleanup KVM_ARM_MAX_VCPUS logic

Commit 4f959ca2e971cd930a368ca458b47e1127bddf23 (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>
arch/arm/include/asm/kvm_host.h
arch/arm/kvm/Kconfig