1 files changed, 2 insertions, 6 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 7109037bdf7c..3162cb467ab3 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -18,6 +18,8 @@ config X86_64
 ### Arch settings
 config X86
         def_bool y
+        select HAVE_OPROFILE
+        select HAVE_KPROBES
 
 config GENERIC_LOCKBREAK
         def_bool n
@@ -106,10 +108,6 @@ config GENERIC_TIME_VSYSCALL
 config HAVE_SETUP_PER_CPU_AREA
         def_bool X86_64
 
-config ARCH_SUPPORTS_OPROFILE
-        bool
-        default y
-
 select HAVE_KVM
 
 config ARCH_HIBERNATION_POSSIBLE
@@ -1597,8 +1595,6 @@ source "drivers/firmware/Kconfig"
 
 source "fs/Kconfig"
 
-source "kernel/Kconfig.instrumentation"
-
 source "arch/x86/Kconfig.debug"
 
 source "security/Kconfig"