Merge branch 'nvme-5.4' of git://git.infradead.org/nvme into for-linus

[linux.git] / drivers / cpuidle / Kconfig

diff --git a/drivers/cpuidle/Kconfig b/drivers/cpuidle/Kconfig
index a4ac31e4a58c3b6004003403f783b254529bad7b..88727b7c0d592cb50c92f085b624a7b659313b27 100644 (file)
--- a/drivers/cpuidle/Kconfig
+++ b/drivers/cpuidle/Kconfig
@@ -33,6 +33,17 @@ config CPU_IDLE_GOV_TEO
          Some workloads benefit from using it and it generally should be safe
          to use.  Say Y here if you are not happy with the alternatives.
 
+config CPU_IDLE_GOV_HALTPOLL
+       bool "Haltpoll governor (for virtualized systems)"
+       depends on KVM_GUEST
+       help
+         This governor implements haltpoll idle state selection, to be
+         used in conjunction with the haltpoll cpuidle driver, allowing
+         for polling for a certain amount of time before entering idle
+         state.
+
+         Some virtualized workloads benefit from using it.
+
 config DT_IDLE_STATES
        bool
 
@@ -51,6 +62,15 @@ depends on PPC
 source "drivers/cpuidle/Kconfig.powerpc"
 endmenu
 
+config HALTPOLL_CPUIDLE
+       tristate "Halt poll cpuidle driver"
+       depends on X86 && KVM_GUEST
+       default y
+       help
+         This option enables halt poll cpuidle driver, which allows to poll
+         before halting in the guest (more efficient than polling in the
+         host via halt_poll_ns for some scenarios).
+
 endif
 
 config ARCH_NEEDS_CPU_IDLE_COUPLED