Merge tag 'timers-core-2020-03-30' of git://git.kernel.org/pub/scm/linux/kernel/git...

[thirdparty/linux.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 8b995db3d10f718ae2d794b1b204d52c56a106e0..e2e326a96788628f635ad7fead05a60736ca51cc 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -127,6 +127,7 @@ config X86
        select GENERIC_GETTIMEOFDAY
        select GENERIC_VDSO_TIME_NS
        select GUP_GET_PTE_LOW_HIGH             if X86_PAE
+       select HARDIRQS_SW_RESEND
        select HARDLOCKUP_CHECK_TIMESTAMP       if X86_64
        select HAVE_ACPI_APEI                   if ACPI
        select HAVE_ACPI_APEI_NMI               if ACPI
@@ -1874,7 +1875,6 @@ config X86_SMAP
 
 config X86_UMIP
        def_bool y
-       depends on CPU_SUP_INTEL || CPU_SUP_AMD
        prompt "User Mode Instruction Prevention" if EXPERT
        ---help---
          User Mode Instruction Prevention (UMIP) is a security feature in