From: Geoff Levand <geoff@infradead.org>
Date: Fri, 7 Jun 2013 01:02:54 +0000 (-0700)
Subject: arm/kvm: Cleanup KVM_ARM_MAX_VCPUS logic
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~22^2~7^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2dda9d829818b055510187059cdfa4ece10c82d;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed