Merge branches 'pm-cpufreq', 'pm-sleep' and 'pm-em'

[linux-2.6-microblaze.git] / arch / arm64 / kvm / Kconfig

diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig
index a4eba09..d7eec0b 100644 (file)
--- a/arch/arm64/kvm/Kconfig
+++ b/arch/arm64/kvm/Kconfig
@@ -26,6 +26,7 @@ menuconfig KVM
        select HAVE_KVM_ARCH_TLB_FLUSH_ALL
        select KVM_MMIO
        select KVM_GENERIC_DIRTYLOG_READ_PROTECT
+       select KVM_XFER_TO_GUEST_WORK
        select SRCU
        select KVM_VFIO
        select HAVE_KVM_EVENTFD
@@ -46,6 +47,15 @@ if KVM
 
 source "virt/kvm/Kconfig"
 
+config NVHE_EL2_DEBUG
+       bool "Debug mode for non-VHE EL2 object"
+       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.
+
 endif # KVM
 
 endif # VIRTUALIZATION