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 64ad10f984a1027d5037f679524841d1829f1530..7a11b905ef49d0949c23d80a985fae3c400528c0 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -55,6 +55,10 @@ config ZONE_DMA
        bool
        default y
 
        bool
        default y
 

+config QUICKLIST
+       bool
+       default y
+

 config SBUS
        bool
 
 config SBUS
        bool
 


@@ -79,10 +83,6 @@ config ARCH_MAY_HAVE_PC_FDC
        bool
        default y
 
        bool
        default y
 

-config ARCH_USES_SLAB_PAGE_STRUCT
-       bool
-       default y
-

 config DMI
        bool
        default y
 config DMI
        bool
        default y


@@ -222,6 +222,8 @@ config PARAVIRT
          However, when run without a hypervisor the kernel is
          theoretically slower.  If in doubt, say N.
 
          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
 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.
 
          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.
 
          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"
 
 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.
        help
          Select this if you have a 32-bit processor and more than 4
          gigabytes of physical RAM.


@@ -858,9 +860,9 @@ config RELOCATABLE
        bool "Build a relocatable kernel(EXPERIMENTAL)"
        depends on EXPERIMENTAL
        help
        bool "Build a relocatable kernel(EXPERIMENTAL)"
        depends on EXPERIMENTAL
        help

-         This build a kernel image that retains relocation information
+         This builds a kernel image that retains relocation information

           so it can be loaded someplace besides the default 1MB.
           so it can be loaded someplace besides the default 1MB.

-         The relocations tend to the kernel binary about 10% larger,
+         The relocations tend to make the kernel binary about 10% larger,

           but are discarded at runtime.
 
          One use is for the kexec on panic case where the recovery kernel
           but are discarded at runtime.
 
          One use is for the kexec on panic case where the recovery kernel


@@ -891,7 +893,7 @@ config PHYSICAL_ALIGN
          Don't change this unless you know what you are doing.
 
 config HOTPLUG_CPU
          Don't change this unless you know what you are doing.
 
 config HOTPLUG_CPU

-       bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
+       bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)"

        depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER
        ---help---
          Say Y here to experiment with turning CPUs off and on, and to
        depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER
        ---help---
          Say Y here to experiment with turning CPUs off and on, and to


@@ -1212,21 +1214,26 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
 
 source "fs/Kconfig"
 

-menu "Instrumentation Support"
+menuconfig INSTRUMENTATION
+       bool "Instrumentation Support"

        depends on EXPERIMENTAL
        depends on EXPERIMENTAL

+       default y
+
+if INSTRUMENTATION

 
 source "arch/i386/oprofile/Kconfig"
 
 config KPROBES
 
 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".
        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"
 
 
 source "arch/i386/Kconfig.debug"