PIE randomization

[linux-2.6-omap-h63xx.git] / arch / i386 / Kconfig

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index d2f6a247414dd2c224a3ebdfec052a4d87d826ee..8531a540ca8c2830ccf6ebdcf6d7a7b0878f25ed 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -441,8 +441,8 @@ config X86_REBOOTFIXUPS
          this config is intended, is when reboot ends with a stalled/hung
          system.
 
-         Currently, the only fixup is for the Geode GX1/CS5530A/TROM2.1.
-         combination.
+         Currently, the only fixup is for the Geode machines using
+         CS5530A and CS5536 chipsets.
 
          Say Y if you want to enable the fixup. Currently, it's safe to
          enable this option even if you don't need it.
@@ -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"