Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

[linux-2.6] / arch / i386 / Kconfig

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 5c8a845a412903a5f871e5626ec2851499ccb134..97b64d7d6bf692baacc019df57845c964c771d39 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -458,8 +458,7 @@ config MICROCODE
        tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
        select FW_LOADER
        ---help---
-         If you say Y here and also to "/dev file system support" in the
-         'File systems' section, you will be able to update the microcode on
+         If you say Y here, you will be able to update the microcode on
          Intel processors in the IA32 family, e.g. Pentium Pro, Pentium II,
          Pentium III, Pentium 4, Xeon etc.  You will obviously need the
          actual microcode binary data itself which is not shipped with the
@@ -615,10 +614,14 @@ config X86_PAE
 
 # Common NUMA Features
 config NUMA
-       bool "Numa Memory Allocation and Scheduler Support"
-       depends on SMP && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI)
+       bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
+       depends on SMP && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL
        default n if X86_PC
        default y if (X86_NUMAQ || X86_SUMMIT)
+       help
+         NUMA support for i386. This is currently high experimental
+         and should be only used for kernel development. It might also
+         cause boot failures.
 
 comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
        depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI)
@@ -1229,6 +1232,11 @@ 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