diff options
| author |   Sean Christopherson <seanjc@google.com> | 2021-09-21 15:22:30 -0700 |
|---|---|---|
| committer |   Marc Zyngier <maz@kernel.org> | 2021-10-11 10:04:59 +0100 |
| commit | c8f1e96734069c788b10545f4fd82bcbb6b55dfa (patch) | |
| tree | 501737dcf35d46b4734eac7a9e93146a57c5ae12 /arch/arm64/kvm/Kconfig | |
| parent | KVM: arm64: Allow KVM to be disabled from the command line (diff) | |
| download | linux-dev-c8f1e96734069c788b10545f4fd82bcbb6b55dfa.tar.xz linux-dev-c8f1e96734069c788b10545f4fd82bcbb6b55dfa.zip | |
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: Sean Christopherson <seanjc@google.com>
[maz: made NVHE_EL2_DEBUG depend on KVM]
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210921222231.518092-2-seanjc@google.com
Diffstat (limited to 'arch/arm64/kvm/Kconfig')
| -rw-r--r-- | arch/arm64/kvm/Kconfig | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index d7eec0b43744..1170b20d68a7 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -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 |