patch-2_6_7-vs1_9_1_12

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

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 7d4f69c..b44faa2 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -65,6 +65,8 @@ config X86_VOYAGER
 
 config X86_NUMAQ
        bool "NUMAQ (IBM/Sequent)"
+       select DISCONTIGMEM
+       select NUMA
        help
          This option is used for getting Linux to run on a (IBM/Sequent) NUMA 
          multiquad box. This changes the way that processors are bootstrapped,
@@ -102,10 +104,10 @@ config X86_VISWS
          and vice versa. See <file:Documentation/sgi-visws.txt> for details.
 
 config X86_GENERICARCH
-       bool "Generic architecture (Summit, bigsmp, default)"
+       bool "Generic architecture (Summit, bigsmp, ES7000, default)"
        depends on SMP
        help
-          This option compiles in the Summit, bigsmp, default subarchitectures.
+          This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.
          It is intended for a generic binary kernel.
 
 config X86_ES7000
@@ -479,6 +481,16 @@ config NR_CPUS
          This is purely to save memory - each supported CPU adds
          approximately eight kilobytes to the kernel image.
 
+config SCHED_SMT
+       bool "SMT (Hyperthreading) scheduler support"
+       depends on SMP
+       default off
+       help
+         SMT scheduler support improves the CPU scheduler's decision making
+         when dealing with Intel Pentium 4 chips with HyperThreading at a
+         cost of slightly increased overhead in some places. If unsure say
+         N here.
+
 config PREEMPT
        bool "Preemptible Kernel"
        help
@@ -538,6 +550,7 @@ config X86_TSC
 
 config X86_MCE
        bool "Machine Check Exception"
+       depends on !X86_VOYAGER
        ---help---
          Machine Check Exception support allows the processor to notify the
          kernel if it detects a problem (e.g. overheating, component failure).
@@ -709,7 +722,7 @@ config X86_PAE
 
 # Common NUMA Features
 config NUMA
-       bool "Numa Memory Allocation Support"
+       bool "Numa Memory Allocation and Scheduler Support"
        depends on SMP && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || (X86_SUMMIT && ACPI))
        default n if X86_PC
        default y if (X86_NUMAQ || X86_SUMMIT)
@@ -813,7 +826,7 @@ config EFI
        This option is only useful on systems that have EFI firmware
        and will result in a kernel image that is ~8k larger.  In addition,
        you must use the latest ELILO loader available at
-       <ftp://ftp.hpl.hp.com/pub/linux-ia64/> in order to take advantage of
+       <http://elilo.sourceforge.net> in order to take advantage of
        kernel initialization using EFI information (neither GRUB nor LILO know
        anything about EFI).  However, even with this option, the resultant
        kernel should continue to boot on existing non-EFI platforms.