Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 8770a5d0b1433fbad255d0de00bb8b21fecfb592..7a11b905ef49d0949c23d80a985fae3c400528c0 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -222,6 +222,8 @@ config PARAVIRT
          However, when run without a hypervisor the kernel is
          theoretically slower.  If in doubt, say N.
 
+source "arch/i386/xen/Kconfig"
+
 config VMI
        bool "VMI Paravirt-ops support"
        depends on PARAVIRT
@@ -441,8 +443,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.
@@ -541,7 +543,7 @@ config HIGHMEM4G
 
 config HIGHMEM64G
        bool "64GB"
-       depends on X86_CMPXCHG64
+       depends on !M386 && !M486
        help
          Select this if you have a 32-bit processor and more than 4
          gigabytes of physical RAM.
@@ -1212,21 +1214,26 @@ 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"
 
 config KPROBES
-       bool "Kprobes (EXPERIMENTAL)"
-       depends on KALLSYMS && EXPERIMENTAL && MODULES
+       bool "Kprobes"
+       depends on KALLSYMS && MODULES
        help
          Kprobes allows you to trap at almost any kernel address and
          execute a callback function.  register_kprobe() establishes
          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"