Merge tag 'trace-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

[sfrench/cifs-2.6.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 89afacce6951e74e327964434d1a46350b661908..7aed87cbf386257237ca55d98ff61eb22b0b7ba2 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -245,7 +245,6 @@ config X86
        select HAVE_FUNCTION_ERROR_INJECTION
        select HAVE_KRETPROBES
        select HAVE_RETHOOK
-       select HAVE_KVM
        select HAVE_LIVEPATCH                   if X86_64
        select HAVE_MIXED_BREAKPOINTS_REGS
        select HAVE_MOD_ARCH_SPECIFIC
@@ -1065,8 +1064,9 @@ config SCHED_MC
 
 config SCHED_MC_PRIO
        bool "CPU core priorities scheduler support"
-       depends on SCHED_MC && CPU_SUP_INTEL
-       select X86_INTEL_PSTATE
+       depends on SCHED_MC
+       select X86_INTEL_PSTATE if CPU_SUP_INTEL
+       select X86_AMD_PSTATE if CPU_SUP_AMD && ACPI
        select CPU_FREQ
        default y
        help
@@ -2104,7 +2104,7 @@ config ARCH_SUPPORTS_CRASH_HOTPLUG
        def_bool y
 
 config ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION
-       def_bool CRASH_CORE
+       def_bool CRASH_RESERVE
 
 config PHYSICAL_START
        hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)