Merge tag 'x86-entry-2020-06-12' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index a16c454..dde7446 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -232,6 +232,7 @@ config X86
        select THREAD_INFO_IN_TASK
        select USER_STACKTRACE_SUPPORT
        select VIRT_TO_BUS
+       select HAVE_ARCH_KCSAN                  if X86_64
        select X86_FEATURE_NAMES                if PROC_FS
        select PROC_PID_ARCH_STATUS             if PROC_FS
        imply IMA_SECURE_AND_OR_TRUSTED_BOOT    if EFI
@@ -821,14 +822,6 @@ config PVH
          This option enables the PVH entry point for guest virtual machines
          as specified in the x86/HVM direct boot ABI.
 
-config KVM_DEBUG_FS
-       bool "Enable debug information for KVM Guests in debugfs"
-       depends on KVM_GUEST && DEBUG_FS
-       ---help---
-         This option enables collection of various statistics for KVM guest.
-         Statistics are displayed in debugfs filesystem. Enabling this option
-         may incur significant overhead.
-
 config PARAVIRT_TIME_ACCOUNTING
        bool "Paravirtual steal time accounting"
        depends on PARAVIRT