Merge tag 'kbuild-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[mirror_ubuntu-jammy-kernel.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 66bb9f25e9dffbae30b0e5e73c712d9c88134645..c28ab5c01879f631fa6429d6cb01f6c5e6d64a8e 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -795,6 +795,7 @@ config KVM_GUEST
        bool "KVM Guest support (including kvmclock)"
        depends on PARAVIRT
        select PARAVIRT_CLOCK
+       select ARCH_CPUIDLE_HALTPOLL
        default y
        ---help---
          This option enables various optimizations for running under the KVM
@@ -803,6 +804,12 @@ config KVM_GUEST
          underlying device model, the host provides the guest with
          timing infrastructure such as time of day, and system time
 
+config ARCH_CPUIDLE_HALTPOLL
+        def_bool n
+        prompt "Disable host haltpoll when loading haltpoll driver"
+        help
+         If virtualized under KVM, disable host haltpoll.
+
 config PVH
        bool "Support for running PVH guests"
        ---help---
@@ -1504,7 +1511,7 @@ config X86_5LEVEL
 
 config X86_DIRECT_GBPAGES
        def_bool y
-       depends on X86_64 && !DEBUG_PAGEALLOC
+       depends on X86_64
        ---help---
          Certain kernel features effectively disable kernel
          linear 1 GB mappings (even if the CPU otherwise