1 files changed, 7 insertions, 2 deletions

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index b1b2b30b1b8e..8531a540ca8c 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -1212,8 +1212,12 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
-menu "Instrumentation Support"
+menuconfig INSTRUMENTATION
+        bool "Instrumentation Support"
         depends on EXPERIMENTAL
+        default y
+
+if INSTRUMENTATION
 
 source "arch/i386/oprofile/Kconfig"
 
@@ -1226,7 +1230,8 @@ config KPROBES
           a probepoint and specifies the callback.  Kprobes is useful
           for kernel debugging, non-intrusive instrumentation and testing.
           If in doubt, say "N".
-endmenu
+
+endif # INSTRUMENTATION
 
 source "arch/i386/Kconfig.debug"