Update arch/ to use sg helpers

[safe/jmp/linux-2.6] / arch / i386 / Kconfig

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index bf9aafa..f6e44fc 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -146,6 +146,7 @@ config X86_ELAN
 
 config X86_VOYAGER
        bool "Voyager (NCR)"
+       select SMP if !BROKEN
        help
          Voyager is an MCA-based 32-way capable SMP architecture proprietary
          to NCR Corp.  Machine classes 345x/35xx/4100/51xx are Voyager-based.
@@ -391,7 +392,7 @@ config X86_MCE_NONFATAL
          will look at the machine check registers to see if anything happened.
          Non-fatal problems automatically get corrected (but still logged).
          Disable this if you don't want to see these messages.
-         Seeing the messages this option prints out may be indicative of dying hardware,
+         Seeing the messages this option prints out may be indicative of dying
          or out-of-spec (ie, overclocked) hardware.
          This option only does something on certain CPUs.
          (AMD Athlon/Duron and Intel Pentium 4)
@@ -630,7 +631,7 @@ config NUMA
        default n if X86_PC
        default y if (X86_NUMAQ || X86_SUMMIT)
        help
-         NUMA support for i386. This is currently high experimental
+         NUMA support for i386. This is currently highly experimental
          and should be only used for kernel development. It might also
          cause boot failures.
 
@@ -831,12 +832,13 @@ config CRASH_DUMP
        depends on HIGHMEM
        help
          Generate crash dump after being started by kexec.
-          This should be normally only set in special crash dump kernels
+         This should be normally only set in special crash dump kernels
          which are loaded in the main kernel with kexec-tools into
          a specially reserved region and then later executed after
          a crash by kdump/kexec. The crash dump kernel must be compiled
-          to a memory address not used by the main kernel or BIOS using
-          PHYSICAL_START.
+         to a memory address not used by the main kernel or BIOS using
+         PHYSICAL_START, or it must be built as a relocatable image
+         (CONFIG_RELOCATABLE=y).
          For more details see Documentation/kdump/kdump.txt
 
 config PHYSICAL_START
@@ -882,17 +884,17 @@ config PHYSICAL_START
          Don't change this unless you know what you are doing.
 
 config RELOCATABLE
-       bool "Build a relocatable kernel(EXPERIMENTAL)"
+       bool "Build a relocatable kernel (EXPERIMENTAL)"
        depends on EXPERIMENTAL
        help
          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 make the kernel binary about 10% larger,
-          but are discarded at runtime.
+         but are discarded at runtime.
 
          One use is for the kexec on panic case where the recovery kernel
-          must live at a different physical address than the primary
-          kernel.
+         must live at a different physical address than the primary
+         kernel.
 
 config PHYSICAL_ALIGN
        hex "Alignment value to which kernel should be aligned"
@@ -1078,7 +1080,9 @@ config APM_REAL_MODE_POWER_OFF
 
 endif # APM
 
-source "arch/x86/kernel/cpu/cpufreq/Kconfig"
+source "arch/x86/kernel/cpu/cpufreq/Kconfig_32"
+
+source "drivers/cpuidle/Kconfig"
 
 endmenu
 
@@ -1254,32 +1258,6 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
-menuconfig INSTRUMENTATION
-       bool "Instrumentation Support"
-       depends on EXPERIMENTAL
-       default y
-       ---help---
-         Say Y here to get to see options related to performance measurement,
-         debugging, and testing. This option alone does not add any kernel code.
-
-         If you say N, all options in this submenu will be skipped and disabled.
-
-if INSTRUMENTATION
-
-source "arch/x86/oprofile/Kconfig"
-
-config KPROBES
-       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".
-
-endif # INSTRUMENTATION
-
 source "arch/i386/Kconfig.debug"
 
 source "security/Kconfig"