Merge tag 'kvmarm-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm...

[thirdparty/kernel/stable.git] / arch / arm64 / kvm / Kconfig

diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig
index 4b25fa4b167c9177e3198518e108a776ff764af1..937f15b7d8c3034dd97dc1ed7230b8cefdaa34a0 100644 (file)
--- a/arch/arm64/kvm/Kconfig
+++ b/arch/arm64/kvm/Kconfig
@@ -37,7 +37,6 @@ menuconfig KVM
        select HAVE_KVM_VCPU_RUN_PID_CHANGE
        select SCHED_INFO
        select GUEST_PERF_EVENTS if PERF_EVENTS
-       select XARRAY_MULTI
        help
          Support hosting virtualized guest machines.
 
@@ -66,4 +65,15 @@ config PROTECTED_NVHE_STACKTRACE
 
          If unsure, or not using protected nVHE (pKVM), say N.
 
+config KVM_ARM64_RES_BITS_PARANOIA
+       bool "Build-time check of RES0/RES1 bits"
+       depends on KVM
+       default n
+       help
+         Say Y here to validate that KVM's knowledge of most system
+         registers' RES0/RES1 bits matches when the rest of the kernel
+         defines. Expect the build to fail badly if you enable this.
+
+         Just say N.
+
 endif # VIRTUALIZATION