KVM: arm64: Move PROTECTED_NVHE_STACKTRACE around

Make the dependency with EL2_DEBUG more obvious by moving the
stacktrace configurtion *after* it.

Signed-off-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Kalesh Singh <kaleshsingh@google.com>
Tested-by: Kalesh Singh <kaleshsingh@google.com>
Reviewed-by: Oliver Upton <oliver.upton@linux.dev>
Link: https://lore.kernel.org/r/20220727142906.1856759-2-maz@kernel.org

diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig
index 09c9958..815cc11 100644 (file)
--- a/arch/arm64/kvm/Kconfig
+++ b/arch/arm64/kvm/Kconfig
@@ -46,6 +46,16 @@ menuconfig KVM
 
          If unsure, say N.
 
+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
+         local EL2 hypervisor development.
+
+         If unsure, say N.
+
 config PROTECTED_NVHE_STACKTRACE
        bool "Protected KVM hypervisor stacktraces"
        depends on NVHE_EL2_DEBUG
@@ -53,22 +63,10 @@ config PROTECTED_NVHE_STACKTRACE
        help
          Say Y here to enable pKVM hypervisor stacktraces on hyp_panic()
 
-         If you are not using protected nVHE (pKVM), say N.
-
          If using protected nVHE mode, but cannot afford the associated
          memory cost (less than 0.75 page per CPU) of pKVM stacktraces,
          say N.
 
-         If unsure, say N.
-
-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
-         local EL2 hypervisor development.
-
-         If unsure, say N.
+         If unsure, or not using protected nVHE (pKVM), say N.
 
 endif # VIRTUALIZATION