Commit c8f1e967 authored by Sean Christopherson's avatar Sean Christopherson Committed by Marc Zyngier
Browse files

KVM: arm64: Unconditionally include generic KVM's Kconfig 



Unconditionally "source" the generic KVM Kconfig instead of wrapping it
with KVM=y.  A future patch will select HAVE_KVM so that referencing
HAVE_KVM in common kernel code doesn't break, and because KVM=y and
HAVE_KVM=n is weird.  Source the generic KVM Kconfig unconditionally so
that HAVE_KVM and KVM don't end up with a circular dependency.

Note, all but one of generic KVM's "configs" are of the HAVE_XYZ nature,
and the one outlier correctly takes a dependency on CONFIG_KVM, i.e. the
generic Kconfig is intended to be included unconditionally.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
[maz: made NVHE_EL2_DEBUG depend on KVM]
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210921222231.518092-2-seanjc@google.com
parent b6a68b97

arch/arm64/kvm/Kconfig

+2 −6
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#



source "virt/lib/Kconfig"

source "virt/kvm/Kconfig"



menuconfig VIRTUALIZATION

	bool "Virtualization"
@@ -43,12 +44,9 @@ menuconfig KVM 


	  If unsure, say N.



if KVM



source "virt/kvm/Kconfig"



config NVHE_EL2_DEBUG

	bool "Debug mode for non-VHE EL2 object"

	depends on KVM

	help

	  Say Y here to enable the debug mode for the non-VHE KVM EL2 object.

	  Failure reports will BUG() in the hypervisor. This is intended for
@@ -56,6 +54,4 @@ config NVHE_EL2_DEBUG 


	  If unsure, say N.



endif # KVM



endif # VIRTUALIZATION