Merge branch 'x86/core' into x86/mce2

1 files changed, 333 insertions, 316 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 52d7013785fe..bd720a67f559 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -5,7 +5,7 @@ mainmenu "Linux Kernel Configuration for x86"
 config 64BIT
         bool "64-bit kernel" if ARCH = "x86"
         default ARCH = "x86_64"
-        help
+        ---help---
           Say yes to build a 64-bit kernel - formerly known as x86_64
           Say no to build a 32-bit kernel - formerly known as i386
 
@@ -34,8 +34,8 @@ config X86
         select HAVE_FUNCTION_TRACER
         select HAVE_FUNCTION_GRAPH_TRACER
         select HAVE_FUNCTION_TRACE_MCOUNT_TEST
-        select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
-        select HAVE_ARCH_KGDB if !X86_VOYAGER
+        select HAVE_KVM
+        select HAVE_ARCH_KGDB
         select HAVE_ARCH_TRACEHOOK
         select HAVE_GENERIC_DMA_COHERENT if X86_32
         select HAVE_EFFICIENT_UNALIGNED_ACCESS
@@ -133,18 +133,16 @@ config ARCH_HAS_CACHE_LINE_SIZE
         def_bool y
 
 config HAVE_SETUP_PER_CPU_AREA
-        def_bool X86_64_SMP || (X86_SMP && !X86_VOYAGER)
+        def_bool y
 
 config HAVE_CPUMASK_OF_CPU_MAP
         def_bool X86_64_SMP
 
 config ARCH_HIBERNATION_POSSIBLE
         def_bool y
-        depends on !SMP || !X86_VOYAGER
 
 config ARCH_SUSPEND_POSSIBLE
         def_bool y
-        depends on !X86_VOYAGER
 
 config ZONE_DMA32
         bool
@@ -174,11 +172,6 @@ config GENERIC_PENDING_IRQ
         depends on GENERIC_HARDIRQS && SMP
         default y
 
-config X86_SMP
-        bool
-        depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)
-        default y
-
 config USE_GENERIC_SMP_HELPERS
         def_bool y
         depends on SMP
@@ -194,19 +187,17 @@ config X86_64_SMP
 config X86_HT
         bool
         depends on SMP
-        depends on (X86_32 && !X86_VOYAGER) || X86_64
-        default y
-
-config X86_BIOS_REBOOT
-        bool
-        depends on !X86_VOYAGER
         default y
 
 config X86_TRAMPOLINE
         bool
-        depends on X86_SMP || (X86_VOYAGER && SMP) || (64BIT && ACPI_SLEEP)
+        depends on SMP || (64BIT && ACPI_SLEEP)
         default y
 
+config X86_32_LAZY_GS
+        def_bool y
+        depends on X86_32 && !CC_STACKPROTECTOR
+
 config KTIME_SCALAR
         def_bool X86_32
 source "init/Kconfig"
@@ -244,14 +235,24 @@ config SMP
 
           If you don't know what to do here, say N.
 
-config X86_HAS_BOOT_CPU_ID
-        def_bool y
-        depends on X86_VOYAGER
+config X86_X2APIC
+        bool "Support x2apic"
+        depends on X86_LOCAL_APIC && X86_64
+        ---help---
+          This enables x2apic support on CPUs that have this feature.
+
+          This allows 32-bit apic IDs (so it can support very large systems),
+          and accesses the local apic via MSRs not via mmio.
+
+          ( On certain CPU models you may need to enable INTR_REMAP too,
+            to get functional x2apic mode. )
+
+          If you don't know what to do here, say N.
 
 config SPARSE_IRQ
         bool "Support sparse irq numbering"
         depends on PCI_MSI || HT_IRQ
-        help
+        ---help---
           This enables support for sparse irqs. This is useful for distro
           kernels that want to define a high CONFIG_NR_CPUS value but still
           want to have low kernel memory footprint on smaller machines.
@@ -265,114 +266,140 @@ config NUMA_MIGRATE_IRQ_DESC
         bool "Move irq desc when changing irq smp_affinity"
         depends on SPARSE_IRQ && NUMA
         default n
-        help
+        ---help---
           This enables moving irq_desc to cpu/node that irq will use handled.
 
           If you don't know what to do here, say N.
 
-config X86_FIND_SMP_CONFIG
-        def_bool y
-        depends on X86_MPPARSE || X86_VOYAGER
-
 config X86_MPPARSE
         bool "Enable MPS table" if ACPI
         default y
         depends on X86_LOCAL_APIC
-        help
+        ---help---
           For old smp systems that do not have proper acpi support. Newer systems
           (esp with 64bit cpus) with acpi support, MADT and DSDT will override it
 
-choice
-        prompt "Subarchitecture Type"
-        default X86_PC
+config X86_BIGSMP
+        bool "Support for big SMP systems with more than 8 CPUs"
+        depends on X86_32 && SMP
+        ---help---
+          This option is needed for the systems that have more than 8 CPUs
 
-config X86_PC
-        bool "PC-compatible"
-        help
-          Choose this option if your computer is a standard PC or compatible.
+if X86_32
+config X86_EXTENDED_PLATFORM
+        bool "Support for extended (non-PC) x86 platforms"
+        default y
+        ---help---
+          If you disable this option then the kernel will only support
+          standard PC platforms. (which covers the vast majority of
+          systems out there.)
+
+          If you enable this option then you'll be able to select support
+          for the following (non-PC) 32 bit x86 platforms:
+                AMD Elan
+                NUMAQ (IBM/Sequent)
+                RDC R-321x SoC
+                SGI 320/540 (Visual Workstation)
+                Summit/EXA (IBM x440)
+                Unisys ES7000 IA32 series
+
+          If you have one of these systems, or if you want to build a
+          generic distribution kernel, say Y here - otherwise say N.
+endif
+
+if X86_64
+config X86_EXTENDED_PLATFORM
+        bool "Support for extended (non-PC) x86 platforms"
+        default y
+        ---help---
+          If you disable this option then the kernel will only support
+          standard PC platforms. (which covers the vast majority of
+          systems out there.)
+
+          If you enable this option then you'll be able to select support
+          for the following (non-PC) 64 bit x86 platforms:
+                ScaleMP vSMP
+                SGI Ultraviolet
+
+          If you have one of these systems, or if you want to build a
+          generic distribution kernel, say Y here - otherwise say N.
+endif
+# This is an alphabetically sorted list of 64 bit extended platforms
+# Please maintain the alphabetic order if and when there are additions
+
+config X86_VSMP
+        bool "ScaleMP vSMP"
+        select PARAVIRT
+        depends on X86_64 && PCI
+        depends on X86_EXTENDED_PLATFORM
+        ---help---
+          Support for ScaleMP vSMP systems.  Say 'Y' here if this kernel is
+          supposed to run on these EM64T-based machines.  Only choose this option
+          if you have one of these machines.
+
+config X86_UV
+        bool "SGI Ultraviolet"
+        depends on X86_64
+        depends on X86_EXTENDED_PLATFORM
+        select X86_X2APIC
+        ---help---
+          This option is needed in order to support SGI Ultraviolet systems.
+          If you don't have one of these, you should say N here.
+
+# Following is an alphabetically sorted list of 32 bit extended platforms
+# Please maintain the alphabetic order if and when there are additions
 
 config X86_ELAN
         bool "AMD Elan"
         depends on X86_32
-        help
+        depends on X86_EXTENDED_PLATFORM
+        ---help---
           Select this for an AMD Elan processor.
 
           Do not use this option for K6/Athlon/Opteron processors!
 
           If unsure, choose "PC-compatible" instead.
 
-config X86_VOYAGER
-        bool "Voyager (NCR)"
-        depends on X86_32 && (SMP || BROKEN) && !PCI
-        help
-          Voyager is an MCA-based 32-way capable SMP architecture proprietary
-          to NCR Corp.  Machine classes 345x/35xx/4100/51xx are Voyager-based.
-
-          *** WARNING ***
-
-          If you do not specifically know you have a Voyager based machine,
-          say N here, otherwise the kernel you build will not be bootable.
-
-config X86_GENERICARCH
-       bool "Generic architecture"
+config X86_RDC321X
+        bool "RDC R-321x SoC"
         depends on X86_32
-       help
-          This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default
+        depends on X86_EXTENDED_PLATFORM
+        select M486
+        select X86_REBOOTFIXUPS
+        ---help---
+          This option is needed for RDC R-321x system-on-chip, also known
+          as R-8610-(G).
+          If you don't have one of these chips, you should say N here.
+
+config X86_32_NON_STANDARD
+        bool "Support non-standard 32-bit SMP architectures"
+        depends on X86_32 && SMP
+        depends on X86_EXTENDED_PLATFORM
+        ---help---
+          This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default
           subarchitectures.  It is intended for a generic binary kernel.
           if you select them all, kernel will probe it one by one. and will
           fallback to default.
 
-if X86_GENERICARCH
+# Alphabetically sorted list of Non standard 32 bit platforms
 
 config X86_NUMAQ
         bool "NUMAQ (IBM/Sequent)"
-        depends on SMP && X86_32 && PCI && X86_MPPARSE
+        depends on X86_32_NON_STANDARD
         select NUMA
-        help
+        select X86_MPPARSE
+        ---help---
           This option is used for getting Linux to run on a NUMAQ (IBM/Sequent)
           NUMA multiquad box. This changes the way that processors are
           bootstrapped, and uses Clustered Logical APIC addressing mode instead
           of Flat Logical.  You will need a new lynxer.elf file to flash your
           firmware with - send email to <Martin.Bligh@us.ibm.com>.
 
-config X86_SUMMIT
-        bool "Summit/EXA (IBM x440)"
-        depends on X86_32 && SMP
-        help
-          This option is needed for IBM systems that use the Summit/EXA chipset.
-          In particular, it is needed for the x440.
-
-config X86_ES7000
-        bool "Support for Unisys ES7000 IA32 series"
-        depends on X86_32 && SMP
-        help
-          Support for Unisys ES7000 systems.  Say 'Y' here if this kernel is
-          supposed to run on an IA32-based Unisys ES7000 system.
-
-config X86_BIGSMP
-        bool "Support for big SMP systems with more than 8 CPUs"
-        depends on X86_32 && SMP
-        help
-          This option is needed for the systems that have more than 8 CPUs
-          and if the system is not of any sub-arch type above.
-
-endif
-
-config X86_VSMP
-        bool "Support for ScaleMP vSMP"
-        select PARAVIRT
-        depends on X86_64 && PCI
-        help
-          Support for ScaleMP vSMP systems.  Say 'Y' here if this kernel is
-          supposed to run on these EM64T-based machines.  Only choose this option
-          if you have one of these machines.
-
-endchoice
-
 config X86_VISWS
         bool "SGI 320/540 (Visual Workstation)"
-        depends on X86_32 && PCI && !X86_VOYAGER && X86_MPPARSE && PCI_GODIRECT
-        help
+        depends on X86_32 && PCI && X86_MPPARSE && PCI_GODIRECT
+        depends on X86_32_NON_STANDARD
+        ---help---
           The SGI Visual Workstation series is an IA32-based workstation
           based on SGI systems chips with some legacy PC hardware attached.
 
@@ -381,21 +408,25 @@ config X86_VISWS
           A kernel compiled for the Visual Workstation will run on general
           PCs as well. See <file:Documentation/sgi-visws.txt> for details.
 
-config X86_RDC321X
-        bool "RDC R-321x SoC"
-        depends on X86_32
-        select M486
-        select X86_REBOOTFIXUPS
-        help
-          This option is needed for RDC R-321x system-on-chip, also known
-          as R-8610-(G).
-          If you don't have one of these chips, you should say N here.
+config X86_SUMMIT
+        bool "Summit/EXA (IBM x440)"
+        depends on X86_32_NON_STANDARD
+        ---help---
+          This option is needed for IBM systems that use the Summit/EXA chipset.
+          In particular, it is needed for the x440.
+
+config X86_ES7000
+        bool "Unisys ES7000 IA32 series"
+        depends on X86_32_NON_STANDARD && X86_BIGSMP
+        ---help---
+          Support for Unisys ES7000 systems.  Say 'Y' here if this kernel is
+          supposed to run on an IA32-based Unisys ES7000 system.
 
 config SCHED_OMIT_FRAME_POINTER
         def_bool y
         prompt "Single-depth WCHAN output"
         depends on X86
-        help
+        ---help---
           Calculate simpler /proc/<PID>/wchan values. If this option
           is disabled then wchan values will recurse back to the
           caller function. This provides more accurate wchan values,
@@ -405,7 +436,7 @@ config SCHED_OMIT_FRAME_POINTER
 
 menuconfig PARAVIRT_GUEST
         bool "Paravirtualized guest support"
-        help
+        ---help---
           Say Y here to get to see options related to running Linux under
           various hypervisors.  This option alone does not add any kernel code.
 
@@ -419,8 +450,7 @@ config VMI
         bool "VMI Guest support"
         select PARAVIRT
         depends on X86_32
-        depends on !X86_VOYAGER
-        help
+        ---help---
           VMI provides a paravirtualized interface to the VMware ESX server
           (it could be used by other hypervisors in theory too, but is not
           at the moment), by linking the kernel to a GPL-ed ROM module
@@ -430,8 +460,7 @@ config KVM_CLOCK
         bool "KVM paravirtualized clock"
         select PARAVIRT
         select PARAVIRT_CLOCK
-        depends on !X86_VOYAGER
-        help
+        ---help---
           Turning on this option will allow you to run a paravirtualized clock
           when running over the KVM hypervisor. Instead of relying on a PIT
           (or probably other) emulation by the underlying device model, the host
@@ -441,17 +470,15 @@ config KVM_CLOCK
 config KVM_GUEST
         bool "KVM Guest support"
         select PARAVIRT
-        depends on !X86_VOYAGER
-        help
-         This option enables various optimizations for running under the KVM
-         hypervisor.
+        ---help---
+          This option enables various optimizations for running under the KVM
+          hypervisor.
 
 source "arch/x86/lguest/Kconfig"
 
 config PARAVIRT
         bool "Enable paravirtualization code"
-        depends on !X86_VOYAGER
-        help
+        ---help---
           This changes the kernel so it can modify itself when it is run
           under a hypervisor, potentially improving performance significantly
           over full virtualization.  However, when run without a hypervisor
@@ -464,51 +491,51 @@ config PARAVIRT_CLOCK
 endif
 
 config PARAVIRT_DEBUG
-       bool "paravirt-ops debugging"
-       depends on PARAVIRT && DEBUG_KERNEL
-       help
-         Enable to debug paravirt_ops internals.  Specifically, BUG if
-         a paravirt_op is missing when it is called.
+        bool "paravirt-ops debugging"
+        depends on PARAVIRT && DEBUG_KERNEL
+        ---help---
+          Enable to debug paravirt_ops internals.  Specifically, BUG if
+          a paravirt_op is missing when it is called.
 
 config MEMTEST
         bool "Memtest"
-        help
+        ---help---
           This option adds a kernel parameter 'memtest', which allows memtest
           to be set.
-                memtest=0, mean disabled; -- default
-                memtest=1, mean do 1 test pattern;
-                ...
-                memtest=4, mean do 4 test patterns.
+                memtest=0, mean disabled; -- default
+                memtest=1, mean do 1 test pattern;
+                ...
+                memtest=4, mean do 4 test patterns.
           If you are unsure how to answer this question, answer N.
 
 config X86_SUMMIT_NUMA
         def_bool y
-        depends on X86_32 && NUMA && X86_GENERICARCH
+        depends on X86_32 && NUMA && X86_32_NON_STANDARD
 
 config X86_CYCLONE_TIMER
         def_bool y
-        depends on X86_GENERICARCH
+        depends on X86_32_NON_STANDARD
 
 source "arch/x86/Kconfig.cpu"
 
 config HPET_TIMER
         def_bool X86_64
         prompt "HPET Timer Support" if X86_32
-        help
-         Use the IA-PC HPET (High Precision Event Timer) to manage
-         time in preference to the PIT and RTC, if a HPET is
-         present.
-         HPET is the next generation timer replacing legacy 8254s.
-         The HPET provides a stable time base on SMP
-         systems, unlike the TSC, but it is more expensive to access,
-         as it is off-chip.  You can find the HPET spec at
-         <http://www.intel.com/hardwaredesign/hpetspec_1.pdf>.
+        ---help---
+          Use the IA-PC HPET (High Precision Event Timer) to manage
+          time in preference to the PIT and RTC, if a HPET is
+          present.
+          HPET is the next generation timer replacing legacy 8254s.
+          The HPET provides a stable time base on SMP
+          systems, unlike the TSC, but it is more expensive to access,
+          as it is off-chip.  You can find the HPET spec at
+          <http://www.intel.com/hardwaredesign/hpetspec_1.pdf>.
 
-         You can safely choose Y here.  However, HPET will only be
-         activated if the platform and the BIOS support this feature.
-         Otherwise the 8254 will be used for timing services.
+          You can safely choose Y here.  However, HPET will only be
+          activated if the platform and the BIOS support this feature.
+          Otherwise the 8254 will be used for timing services.
 
-         Choose N to continue using the legacy 8254 timer.
+          Choose N to continue using the legacy 8254 timer.
 
 config HPET_EMULATE_RTC
         def_bool y
@@ -519,7 +546,7 @@ config HPET_EMULATE_RTC
 config DMI
         default y
         bool "Enable DMI scanning" if EMBEDDED
-        help
+        ---help---
           Enabled scanning of DMI to identify machine quirks. Say Y
           here unless you have verified that your setup is not
           affected by entries in the DMI blacklist. Required by PNP
@@ -531,7 +558,7 @@ config GART_IOMMU
         select SWIOTLB
         select AGP
         depends on X86_64 && PCI
-        help
+        ---help---
           Support for full DMA access of devices with 32bit memory access only
           on systems with more than 3GB. This is usually needed for USB,
           sound, many IDE/SATA chipsets and some other devices.
@@ -546,7 +573,7 @@ config CALGARY_IOMMU
         bool "IBM Calgary IOMMU support"
         select SWIOTLB
         depends on X86_64 && PCI && EXPERIMENTAL
-        help
+        ---help---
           Support for hardware IOMMUs in IBM's xSeries x366 and x460
           systems. Needed to run systems with more than 3GB of memory
           properly with 32-bit PCI devices that do not support DAC
@@ -564,7 +591,7 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT
         def_bool y
         prompt "Should Calgary be enabled by default?"
         depends on CALGARY_IOMMU
-        help
+        ---help---
           Should Calgary be enabled by default? if you choose 'y', Calgary
           will be used (if it exists). If you choose 'n', Calgary will not be
           used even if it exists. If you choose 'n' and would like to use
@@ -576,7 +603,7 @@ config AMD_IOMMU
         select SWIOTLB
         select PCI_MSI
         depends on X86_64 && PCI && ACPI
-        help
+        ---help---
           With this option you can enable support for AMD IOMMU hardware in
           your system. An IOMMU is a hardware component which provides
           remapping of DMA memory accesses from devices. With an AMD IOMMU you
@@ -591,7 +618,7 @@ config AMD_IOMMU_STATS
         bool "Export AMD IOMMU statistics to debugfs"
         depends on AMD_IOMMU
         select DEBUG_FS
-        help
+        ---help---
           This option enables code in the AMD IOMMU driver to collect various
           statistics about whats happening in the driver and exports that
           information to userspace via debugfs.
@@ -600,7 +627,7 @@ config AMD_IOMMU_STATS
 # need this always selected by IOMMU for the VIA workaround
 config SWIOTLB
         def_bool y if X86_64
-        help
+        ---help---
           Support for software bounce buffers used on x86-64 systems
           which don't have a hardware IOMMU (e.g. the current generation
           of Intel's x86-64 CPUs). Using this PCI devices which can only
@@ -618,7 +645,7 @@ config MAXSMP
         depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL
         select CPUMASK_OFFSTACK
         default n
-        help
+        ---help---
           Configure maximum number of CPUS and NUMA Nodes for this architecture.
           If unsure, say N.
 
@@ -629,7 +656,7 @@ config NR_CPUS
         default "4096" if MAXSMP
         default "32" if SMP && (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000)
         default "8" if SMP
-        help
+        ---help---
           This allows you to specify the maximum number of CPUs which this
           kernel will support.  The maximum supported value is 512 and the
           minimum value which makes sense is 2.
@@ -640,7 +667,7 @@ config NR_CPUS
 config SCHED_SMT
         bool "SMT (Hyperthreading) scheduler support"
         depends on X86_HT
-        help
+        ---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
@@ -650,7 +677,7 @@ config SCHED_MC
         def_bool y
         prompt "Multi-core scheduler support"
         depends on X86_HT
-        help
+        ---help---
           Multi-core scheduler support improves the CPU scheduler's decision
           making when dealing with multi-core CPU chips at a cost of slightly
           increased overhead in some places. If unsure say N here.
@@ -659,8 +686,8 @@ source "kernel/Kconfig.preempt"
 
 config X86_UP_APIC
         bool "Local APIC support on uniprocessors"
-        depends on X86_32 && !SMP && !(X86_VOYAGER || X86_GENERICARCH)
-        help
+        depends on X86_32 && !SMP && !X86_32_NON_STANDARD
+        ---help---
           A local APIC (Advanced Programmable Interrupt Controller) is an
           integrated interrupt controller in the CPU. If you have a single-CPU
           system which has a processor with a local APIC, you can say Y here to
@@ -673,7 +700,7 @@ config X86_UP_APIC
 config X86_UP_IOAPIC
         bool "IO-APIC support on uniprocessors"
         depends on X86_UP_APIC
-        help
+        ---help---
           An IO-APIC (I/O Advanced Programmable Interrupt Controller) is an
           SMP-capable replacement for PC-style interrupt controllers. Most
           SMP systems and many recent uniprocessor systems have one.
@@ -684,11 +711,11 @@ config X86_UP_IOAPIC
 
 config X86_LOCAL_APIC
         def_bool y
-        depends on X86_64 || (X86_32 && (X86_UP_APIC || (SMP && !X86_VOYAGER) || X86_GENERICARCH))
+        depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC
 
 config X86_IO_APIC
         def_bool y
-        depends on X86_64 || (X86_32 && (X86_UP_IOAPIC || (SMP && !X86_VOYAGER) || X86_GENERICARCH))
+        depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC
 
 config X86_VISWS_APIC
         def_bool y
@@ -698,7 +725,7 @@ config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
         bool "Reroute for broken boot IRQs"
         default n
         depends on X86_IO_APIC
-        help
+        ---help---
           This option enables a workaround that fixes a source of
           spurious interrupts. This is recommended when threaded
           interrupt handling is used on systems where the generation of
@@ -720,7 +747,6 @@ config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
 
 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).
@@ -739,7 +765,7 @@ config X86_MCE_INTEL
         def_bool y
         prompt "Intel MCE features"
         depends on X86_64 && X86_MCE && X86_LOCAL_APIC
-        help
+        ---help---
            Additional support for intel specific MCE features such as
            the thermal monitor.
 
@@ -747,7 +773,7 @@ config X86_MCE_AMD
         def_bool y
         prompt "AMD MCE features"
         depends on X86_64 && X86_MCE && X86_LOCAL_APIC
-        help
+        ---help---
            Additional support for AMD specific MCE features such as
            the DRAM Error Threshold.
 
@@ -759,7 +785,7 @@ config X86_MCE_THRESHOLD
 config X86_MCE_NONFATAL
         tristate "Check for non-fatal errors on AMD Athlon/Duron / Intel Pentium 4"
         depends on X86_32 && X86_MCE
-        help
+        ---help---
           Enabling this feature starts a timer that triggers every 5 seconds which
           will look at the machine check registers to see if anything happened.
           Non-fatal problems automatically get corrected (but still logged).
@@ -772,7 +798,7 @@ config X86_MCE_NONFATAL
 config X86_MCE_P4THERMAL
         bool "check for P4 thermal throttling interrupt."
         depends on X86_32 && X86_MCE && (X86_UP_APIC || SMP)
-        help
+        ---help---
           Enabling this feature will cause a message to be printed when the P4
           enters thermal throttling.
 
@@ -780,11 +806,11 @@ config VM86
         bool "Enable VM86 support" if EMBEDDED
         default y
         depends on X86_32
-        help
-          This option is required by programs like DOSEMU to run 16-bit legacy
+        ---help---
+          This option is required by programs like DOSEMU to run 16-bit legacy
           code on X86 processors. It also may be needed by software like
-          XFree86 to initialize some video cards via BIOS. Disabling this
-          option saves about 6k.
+          XFree86 to initialize some video cards via BIOS. Disabling this
+          option saves about 6k.
 
 config TOSHIBA
         tristate "Toshiba Laptop support"
@@ -858,33 +884,33 @@ config MICROCODE
           module will be called microcode.
 
 config MICROCODE_INTEL
-       bool "Intel microcode patch loading support"
-       depends on MICROCODE
-       default MICROCODE
-       select FW_LOADER
-       --help---
-         This options enables microcode patch loading support for Intel
-         processors.
-
-         For latest news and information on obtaining all the required
-         Intel ingredients for this driver, check:
-         <http://www.urbanmyth.org/microcode/>.
+        bool "Intel microcode patch loading support"
+        depends on MICROCODE
+        default MICROCODE
+        select FW_LOADER
+        ---help---
+          This options enables microcode patch loading support for Intel
+          processors.
+
+          For latest news and information on obtaining all the required
+          Intel ingredients for this driver, check:
+          <http://www.urbanmyth.org/microcode/>.
 
 config MICROCODE_AMD
-       bool "AMD microcode patch loading support"
-       depends on MICROCODE
-       select FW_LOADER
-       --help---
-         If you select this option, microcode patch loading support for AMD
-         processors will be enabled.
+        bool "AMD microcode patch loading support"
+        depends on MICROCODE
+        select FW_LOADER
+        ---help---
+          If you select this option, microcode patch loading support for AMD
+          processors will be enabled.
 
-   config MICROCODE_OLD_INTERFACE
+config MICROCODE_OLD_INTERFACE
         def_bool y
         depends on MICROCODE
 
 config X86_MSR
         tristate "/dev/cpu/*/msr - Model-specific register support"
-        help
+        ---help---
           This device gives privileged processes access to the x86
           Model-Specific Registers (MSRs).  It is a character device with
           major 202 and minors 0 to 31 for /dev/cpu/0/msr to /dev/cpu/31/msr.
@@ -893,7 +919,7 @@ config X86_MSR
 
 config X86_CPUID
         tristate "/dev/cpu/*/cpuid - CPU information support"
-        help
+        ---help---
           This device gives processes access to the x86 CPUID instruction to
           be executed on a specific processor.  It is a character device
           with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
@@ -945,7 +971,7 @@ config NOHIGHMEM
 config HIGHMEM4G
         bool "4GB"
         depends on !X86_NUMAQ
-        help
+        ---help---
           Select this if you have a 32-bit processor and between 1 and 4
           gigabytes of physical RAM.
 
@@ -953,7 +979,7 @@ config HIGHMEM64G
         bool "64GB"
         depends on !M386 && !M486
         select X86_PAE
-        help
+        ---help---
           Select this if you have a 32-bit processor and more than 4
           gigabytes of physical RAM.
 
@@ -964,7 +990,7 @@ choice
         prompt "Memory split" if EMBEDDED
         default VMSPLIT_3G
         depends on X86_32
-        help
+        ---help---
           Select the desired split between kernel and user memory.
 
           If the address range available to the kernel is less than the
@@ -1010,20 +1036,20 @@ config HIGHMEM
 config X86_PAE
         bool "PAE (Physical Address Extension) Support"
         depends on X86_32 && !HIGHMEM4G
-        help
+        ---help---
           PAE is required for NX support, and furthermore enables
           larger swapspace support for non-overcommit purposes. It
           has the cost of more pagetable lookup overhead, and also
           consumes more pagetable space per process.
 
 config ARCH_PHYS_ADDR_T_64BIT
-       def_bool X86_64 || X86_PAE
+        def_bool X86_64 || X86_PAE
 
 config DIRECT_GBPAGES
         bool "Enable 1GB pages for kernel pagetables" if EMBEDDED
         default y
         depends on X86_64
-        help
+        ---help---
           Allow the kernel linear mapping to use 1GB pages on CPUs that
           support it. This can improve the kernel's performance a tiny bit by
           reducing TLB pressure. If in doubt, say "Y".
@@ -1033,9 +1059,8 @@ config NUMA
         bool "Numa Memory Allocation and Scheduler Support"
         depends on SMP
         depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL)
-        default n if X86_PC
         default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP)
-        help
+        ---help---
           Enable NUMA (Non Uniform Memory Access) support.
 
           The kernel will try to allocate memory used by a CPU on the
@@ -1058,19 +1083,19 @@ config K8_NUMA
         def_bool y
         prompt "Old style AMD Opteron NUMA detection"
         depends on X86_64 && NUMA && PCI
-        help
-         Enable K8 NUMA node topology detection.  You should say Y here if
-         you have a multi processor AMD K8 system. This uses an old
-         method to read the NUMA configuration directly from the builtin
-         Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA
-         instead, which also takes priority if both are compiled in.
+        ---help---
+          Enable K8 NUMA node topology detection.  You should say Y here if
+          you have a multi processor AMD K8 system. This uses an old
+          method to read the NUMA configuration directly from the builtin
+          Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA
+          instead, which also takes priority if both are compiled in.
 
 config X86_64_ACPI_NUMA
         def_bool y
         prompt "ACPI NUMA detection"
         depends on X86_64 && NUMA && ACPI && PCI
         select ACPI_NUMA
-        help
+        ---help---
           Enable ACPI SRAT based node topology detection.
 
 # Some NUMA nodes have memory ranges that span
@@ -1085,7 +1110,7 @@ config NODES_SPAN_OTHER_NODES
 config NUMA_EMU
         bool "NUMA emulation"
         depends on X86_64 && NUMA
-        help
+        ---help---
           Enable NUMA emulation. A flat machine will be split
           into virtual nodes when booted with "numa=fake=N", where N is the
           number of nodes. This is only useful for debugging.
@@ -1098,7 +1123,7 @@ config NODES_SHIFT
         default "4" if X86_NUMAQ
         default "3"
         depends on NEED_MULTIPLE_NODES
-        help
+        ---help---
           Specify the maximum number of NUMA Nodes available on the target
           system.  Increases memory reserved to accomodate various tables.
 
@@ -1136,7 +1161,7 @@ config ARCH_SPARSEMEM_DEFAULT
 
 config ARCH_SPARSEMEM_ENABLE
         def_bool y
-        depends on X86_64 || NUMA || (EXPERIMENTAL && X86_PC) || X86_GENERICARCH
+        depends on X86_64 || NUMA || (EXPERIMENTAL && X86_32) || X86_32_NON_STANDARD
         select SPARSEMEM_STATIC if X86_32
         select SPARSEMEM_VMEMMAP_ENABLE if X86_64
 
@@ -1153,61 +1178,61 @@ source "mm/Kconfig"
 config HIGHPTE
         bool "Allocate 3rd-level pagetables from highmem"
         depends on X86_32 && (HIGHMEM4G || HIGHMEM64G)
-        help
+        ---help---
           The VM uses one page table entry for each page of physical memory.
           For systems with a lot of RAM, this can be wasteful of precious
           low memory.  Setting this option will put user-space page table
           entries in high memory.
 
 config X86_CHECK_BIOS_CORRUPTION
-        bool "Check for low memory corruption"
-        help
-         Periodically check for memory corruption in low memory, which
-         is suspected to be caused by BIOS.  Even when enabled in the
-         configuration, it is disabled at runtime.  Enable it by
-         setting "memory_corruption_check=1" on the kernel command
-         line.  By default it scans the low 64k of memory every 60
-         seconds; see the memory_corruption_check_size and
-         memory_corruption_check_period parameters in
-         Documentation/kernel-parameters.txt to adjust this.
-
-         When enabled with the default parameters, this option has
-         almost no overhead, as it reserves a relatively small amount
-         of memory and scans it infrequently.  It both detects corruption
-         and prevents it from affecting the running system.
-
-         It is, however, intended as a diagnostic tool; if repeatable
-         BIOS-originated corruption always affects the same memory,
-         you can use memmap= to prevent the kernel from using that
-         memory.
+        bool "Check for low memory corruption"
+        ---help---
+          Periodically check for memory corruption in low memory, which
+          is suspected to be caused by BIOS.  Even when enabled in the
+          configuration, it is disabled at runtime.  Enable it by
+          setting "memory_corruption_check=1" on the kernel command
+          line.  By default it scans the low 64k of memory every 60
+          seconds; see the memory_corruption_check_size and
+          memory_corruption_check_period parameters in
+          Documentation/kernel-parameters.txt to adjust this.
+
+          When enabled with the default parameters, this option has
+          almost no overhead, as it reserves a relatively small amount
+          of memory and scans it infrequently.  It both detects corruption
+          and prevents it from affecting the running system.
+
+          It is, however, intended as a diagnostic tool; if repeatable
+          BIOS-originated corruption always affects the same memory,
+          you can use memmap= to prevent the kernel from using that
+          memory.
 
 config X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK
-        bool "Set the default setting of memory_corruption_check"
+        bool "Set the default setting of memory_corruption_check"
         depends on X86_CHECK_BIOS_CORRUPTION
         default y
-        help
-         Set whether the default state of memory_corruption_check is
-         on or off.
+        ---help---
+          Set whether the default state of memory_corruption_check is
+          on or off.
 
 config X86_RESERVE_LOW_64K
-        bool "Reserve low 64K of RAM on AMI/Phoenix BIOSen"
+        bool "Reserve low 64K of RAM on AMI/Phoenix BIOSen"
         default y
-        help
-         Reserve the first 64K of physical RAM on BIOSes that are known
-         to potentially corrupt that memory range. A numbers of BIOSes are
-         known to utilize this area during suspend/resume, so it must not
-         be used by the kernel.
+        ---help---
+          Reserve the first 64K of physical RAM on BIOSes that are known
+          to potentially corrupt that memory range. A numbers of BIOSes are
+          known to utilize this area during suspend/resume, so it must not
+          be used by the kernel.
 
-         Set this to N if you are absolutely sure that you trust the BIOS
-         to get all its memory reservations and usages right.
+          Set this to N if you are absolutely sure that you trust the BIOS
+          to get all its memory reservations and usages right.
 
-         If you have doubts about the BIOS (e.g. suspend/resume does not
-         work or there's kernel crashes after certain hardware hotplug
-         events) and it's not AMI or Phoenix, then you might want to enable
-         X86_CHECK_BIOS_CORRUPTION=y to allow the kernel to check typical
-         corruption patterns.
+          If you have doubts about the BIOS (e.g. suspend/resume does not
+          work or there's kernel crashes after certain hardware hotplug
+          events) and it's not AMI or Phoenix, then you might want to enable
+          X86_CHECK_BIOS_CORRUPTION=y to allow the kernel to check typical
+          corruption patterns.
 
-         Say Y if unsure.
+          Say Y if unsure.
 
 config MATH_EMULATION
         bool
@@ -1273,7 +1298,7 @@ config MTRR_SANITIZER
         def_bool y
         prompt "MTRR cleanup support"
         depends on MTRR
-        help
+        ---help---
           Convert MTRR layout from continuous to discrete, so X drivers can
           add writeback entries.
 
@@ -1288,7 +1313,7 @@ config MTRR_SANITIZER_ENABLE_DEFAULT
         range 0 1
         default "0"
         depends on MTRR_SANITIZER
-        help
+        ---help---
           Enable mtrr cleanup default value
 
 config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT
@@ -1296,7 +1321,7 @@ config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT
         range 0 7
         default "1"
         depends on MTRR_SANITIZER
-        help
+        ---help---
           mtrr cleanup spare entries default, it can be changed via
           mtrr_spare_reg_nr=N on the kernel command line.
 
@@ -1304,7 +1329,7 @@ config X86_PAT
         bool
         prompt "x86 PAT support"
         depends on MTRR
-        help
+        ---help---
           Use PAT attributes to setup page level cache control.
 
           PATs are the modern equivalents of MTRRs and are much more
@@ -1319,20 +1344,20 @@ config EFI
         bool "EFI runtime service support"
         depends on ACPI
         ---help---
-        This enables the kernel to use EFI runtime services that are
-        available (such as the EFI variable services).
+          This enables the kernel to use EFI runtime services that are
+          available (such as the EFI variable services).
 
-        This option is only useful on systems that have EFI firmware.
-        In addition, you should use the latest ELILO loader available
-        at <http://elilo.sourceforge.net> in order to take advantage
-        of EFI runtime services. However, even with this option, the
-        resultant kernel should continue to boot on existing non-EFI
-        platforms.
+          This option is only useful on systems that have EFI firmware.
+          In addition, you should use the latest ELILO loader available
+          at <http://elilo.sourceforge.net> in order to take advantage
+          of EFI runtime services. However, even with this option, the
+          resultant kernel should continue to boot on existing non-EFI
+          platforms.
 
 config SECCOMP
         def_bool y
         prompt "Enable seccomp to safely compute untrusted bytecode"
-        help
+        ---help---
           This kernel feature is useful for number crunching applications
           that may need to compute untrusted bytecode during their
           execution. By using pipes or other transports made available to
@@ -1345,13 +1370,16 @@ config SECCOMP
 
           If unsure, say Y. Only embedded should say N here.
 
+config CC_STACKPROTECTOR_ALL
+        bool
+
 config CC_STACKPROTECTOR
         bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
-        depends on X86_64 && EXPERIMENTAL && BROKEN
-        help
-         This option turns on the -fstack-protector GCC feature. This
-          feature puts, at the beginning of critical functions, a canary
-          value on the stack just before the return address, and validates
+        select CC_STACKPROTECTOR_ALL
+        ---help---
+          This option turns on the -fstack-protector GCC feature. This
+          feature puts, at the beginning of functions, a canary value on
+          the stack just before the return address, and validates
           the value just before actually returning.  Stack based buffer
           overflows (that need to overwrite this return address) now also
           overwrite the canary, which gets detected and the attack is then
@@ -1359,22 +1387,14 @@ config CC_STACKPROTECTOR
 
           This feature requires gcc version 4.2 or above, or a distribution
           gcc with the feature backported. Older versions are automatically
-          detected and for those versions, this configuration option is ignored.
-
-config CC_STACKPROTECTOR_ALL
-        bool "Use stack-protector for all functions"
-        depends on CC_STACKPROTECTOR
-        help
-          Normally, GCC only inserts the canary value protection for
-          functions that use large-ish on-stack buffers. By enabling
-          this option, GCC will be asked to do this for ALL functions.
+          detected and for those versions, this configuration option is
+          ignored. (and a warning is printed during bootup)
 
 source kernel/Kconfig.hz
 
 config KEXEC
         bool "kexec system call"
-        depends on X86_BIOS_REBOOT
-        help
+        ---help---
           kexec is a system call that implements the ability to shutdown your
           current kernel, and to start another kernel.  It is like a reboot
           but it is independent of the system firmware.   And like a reboot
@@ -1391,7 +1411,7 @@ config KEXEC
 config CRASH_DUMP
         bool "kernel crash dumps"
         depends on X86_64 || (X86_32 && HIGHMEM)
-        help
+        ---help---
           Generate crash dump after being started by kexec.
           This should be normally only set in special crash dump kernels
           which are loaded in the main kernel with kexec-tools into
@@ -1406,7 +1426,7 @@ config KEXEC_JUMP
         bool "kexec jump (EXPERIMENTAL)"
         depends on EXPERIMENTAL
         depends on KEXEC && HIBERNATION && X86_32
-        help
+        ---help---
           Jump between original kernel and kexeced kernel and invoke
           code in physical address mode via KEXEC
 
@@ -1415,7 +1435,7 @@ config PHYSICAL_START
         default "0x1000000" if X86_NUMAQ
         default "0x200000" if X86_64
         default "0x100000"
-        help
+        ---help---
           This gives the physical address where the kernel is loaded.
 
           If kernel is a not relocatable (CONFIG_RELOCATABLE=n) then
@@ -1456,7 +1476,7 @@ config PHYSICAL_START
 config RELOCATABLE
         bool "Build a relocatable kernel (EXPERIMENTAL)"
         depends on EXPERIMENTAL
-        help
+        ---help---
           This builds a kernel image that retains relocation information
           so it can be loaded someplace besides the default 1MB.
           The relocations tend to make the kernel binary about 10% larger,
@@ -1476,7 +1496,7 @@ config PHYSICAL_ALIGN
         default "0x100000" if X86_32
         default "0x200000" if X86_64
         range 0x2000 0x400000
-        help
+        ---help---
           This value puts the alignment restrictions on physical address
           where kernel is loaded and run from. Kernel is compiled for an
           address which meets above alignment restriction.
@@ -1497,7 +1517,7 @@ config PHYSICAL_ALIGN
 
 config HOTPLUG_CPU
         bool "Support for hot-pluggable CPUs"
-        depends on SMP && HOTPLUG && !X86_VOYAGER
+        depends on SMP && HOTPLUG
         ---help---
           Say Y here to allow turning CPUs off and on. CPUs can be
           controlled through /sys/devices/system/cpu.
@@ -1509,7 +1529,7 @@ config COMPAT_VDSO
         def_bool y
         prompt "Compat VDSO support"
         depends on X86_32 || IA32_EMULATION
-        help
+        ---help---
           Map the 32-bit VDSO to the predictable old-style address too.
         ---help---
           Say N here if you are running a sufficiently recent glibc
@@ -1521,7 +1541,7 @@ config COMPAT_VDSO
 config CMDLINE_BOOL
         bool "Built-in kernel command line"
         default n
-        help
+        ---help---
           Allow for specifying boot arguments to the kernel at
           build time.  On some systems (e.g. embedded ones), it is
           necessary or convenient to provide some or all of the
@@ -1539,7 +1559,7 @@ config CMDLINE
         string "Built-in kernel command string"
         depends on CMDLINE_BOOL
         default ""
-        help
+        ---help---
           Enter arguments here that should be compiled into the kernel
           image and used at boot time.  If the boot loader provides a
           command line at boot time, it is appended to this string to
@@ -1556,7 +1576,7 @@ config CMDLINE_OVERRIDE
         bool "Built-in command line overrides boot loader arguments"
         default n
         depends on CMDLINE_BOOL
-        help
+        ---help---
           Set this option to 'Y' to have the kernel ignore the boot loader
           command line, and use ONLY the built-in command line.
 
@@ -1578,7 +1598,6 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
         depends on NUMA
 
 menu "Power management and ACPI options"
-        depends on !X86_VOYAGER
 
 config ARCH_HIBERNATION_HEADER
         def_bool y
@@ -1656,7 +1675,7 @@ if APM
 
 config APM_IGNORE_USER_SUSPEND
         bool "Ignore USER SUSPEND"
-        help
+        ---help---
           This option will ignore USER SUSPEND requests. On machines with a
           compliant APM BIOS, you want to say N. However, on the NEC Versa M
           series notebooks, it is necessary to say Y because of a BIOS bug.
@@ -1680,7 +1699,7 @@ config APM_DO_ENABLE
 
 config APM_CPU_IDLE
         bool "Make CPU Idle calls when idle"
-        help
+        ---help---
           Enable calls to APM CPU Idle/CPU Busy inside the kernel's idle loop.
           On some machines, this can activate improved power savings, such as
           a slowed CPU clock rate, when the machine is idle. These idle calls
@@ -1691,7 +1710,7 @@ config APM_CPU_IDLE
 
 config APM_DISPLAY_BLANK
         bool "Enable console blanking using APM"
-        help
+        ---help---
           Enable console blanking using the APM. Some laptops can use this to
           turn off the LCD backlight when the screen blanker of the Linux
           virtual console blanks the screen. Note that this is only used by
@@ -1704,7 +1723,7 @@ config APM_DISPLAY_BLANK
 
 config APM_ALLOW_INTS
         bool "Allow interrupts during APM BIOS calls"
-        help
+        ---help---
           Normally we disable external interrupts while we are making calls to
           the APM BIOS as a measure to lessen the effects of a badly behaving
           BIOS implementation.  The BIOS should reenable interrupts if it
@@ -1729,7 +1748,7 @@ config PCI
         bool "PCI support"
         default y
         select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)
-        help
+        ---help---
           Find out whether you have a PCI motherboard. PCI is the name of a
           bus system, i.e. the way the CPU talks to the other stuff inside
           your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
@@ -1800,7 +1819,7 @@ config PCI_MMCONFIG
 config DMAR
         bool "Support for DMA Remapping Devices (EXPERIMENTAL)"
         depends on X86_64 && PCI_MSI && ACPI && EXPERIMENTAL
-        help
+        ---help---
           DMA remapping (DMAR) devices support enables independent address
           translations for Direct Memory Access (DMA) from devices.
           These DMA remapping devices are reported via ACPI tables
@@ -1822,29 +1841,30 @@ config DMAR_GFX_WA
         def_bool y
         prompt "Support for Graphics workaround"
         depends on DMAR
-        help
-         Current Graphics drivers tend to use physical address
-         for DMA and avoid using DMA APIs. Setting this config
-         option permits the IOMMU driver to set a unity map for
-         all the OS-visible memory. Hence the driver can continue
-         to use physical addresses for DMA.
+        ---help---
+          Current Graphics drivers tend to use physical address
+          for DMA and avoid using DMA APIs. Setting this config
+          option permits the IOMMU driver to set a unity map for
+          all the OS-visible memory. Hence the driver can continue
+          to use physical addresses for DMA.
 
 config DMAR_FLOPPY_WA
         def_bool y
         depends on DMAR
-        help
-         Floppy disk drivers are know to bypass DMA API calls
-         thereby failing to work when IOMMU is enabled. This
-         workaround will setup a 1:1 mapping for the first
-         16M to make floppy (an ISA device) work.
+        ---help---
+          Floppy disk drivers are know to bypass DMA API calls
+          thereby failing to work when IOMMU is enabled. This
+          workaround will setup a 1:1 mapping for the first
+          16M to make floppy (an ISA device) work.
 
 config INTR_REMAP
         bool "Support for Interrupt Remapping (EXPERIMENTAL)"
         depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI && EXPERIMENTAL
-        help
-         Supports Interrupt remapping for IO-APIC and MSI devices.
-         To use x2apic mode in the CPU's which support x2APIC enhancements or
-         to support platforms with CPU's having > 8 bit APIC ID, say Y.
+        select X86_X2APIC
+        ---help---
+          Supports Interrupt remapping for IO-APIC and MSI devices.
+          To use x2apic mode in the CPU's which support x2APIC enhancements or
+          to support platforms with CPU's having > 8 bit APIC ID, say Y.
 
 source "drivers/pci/pcie/Kconfig"
 
@@ -1858,8 +1878,7 @@ if X86_32
 
 config ISA
         bool "ISA support"
-        depends on !X86_VOYAGER
-        help
+        ---help---
           Find out whether you have ISA slots on your motherboard.  ISA is the
           name of a bus system, i.e. the way the CPU talks to the other stuff
           inside your box.  Other bus systems are PCI, EISA, MicroChannel
@@ -1885,9 +1904,8 @@ config EISA
 source "drivers/eisa/Kconfig"
 
 config MCA
-        bool "MCA support" if !X86_VOYAGER
-        default y if X86_VOYAGER
-        help
+        bool "MCA support"
+        ---help---
           MicroChannel Architecture is found in some IBM PS/2 machines and
           laptops.  It is a bus system similar to PCI or ISA. See
           <file:Documentation/mca.txt> (and especially the web page given
@@ -1897,8 +1915,7 @@ source "drivers/mca/Kconfig"
 
 config SCx200
         tristate "NatSemi SCx200 support"
-        depends on !X86_VOYAGER
-        help
+        ---help---
           This provides basic support for National Semiconductor's
           (now AMD's) Geode processors.  The driver probes for the
           PCI-IDs of several on-chip devices, so its a good dependency
@@ -1910,7 +1927,7 @@ config SCx200HR_TIMER
         tristate "NatSemi SCx200 27MHz High-Resolution Timer Support"
         depends on SCx200 && GENERIC_TIME
         default y
-        help
+        ---help---
           This driver provides a clocksource built upon the on-chip
           27MHz high-resolution timer.  Its also a workaround for
           NSC Geode SC-1100's buggy TSC, which loses time when the
@@ -1921,7 +1938,7 @@ config GEODE_MFGPT_TIMER
         def_bool y
         prompt "Geode Multi-Function General Purpose Timer (MFGPT) events"
         depends on MGEODE_LX && GENERIC_TIME && GENERIC_CLOCKEVENTS
-        help
+        ---help---
           This driver provides a clock event source based on the MFGPT
           timer(s) in the CS5535 and CS5536 companion chip for the geode.
           MFGPTs have a better resolution and max interval than the
@@ -1930,7 +1947,7 @@ config GEODE_MFGPT_TIMER
 config OLPC
         bool "One Laptop Per Child support"
         default n
-        help
+        ---help---
           Add support for detecting the unique features of the OLPC
           XO hardware.
 
@@ -1955,16 +1972,16 @@ config IA32_EMULATION
         bool "IA32 Emulation"
         depends on X86_64
         select COMPAT_BINFMT_ELF
-        help
+        ---help---
           Include code to run 32-bit programs under a 64-bit kernel. You should
           likely turn this on, unless you're 100% sure that you don't have any
           32-bit programs left.
 
 config IA32_AOUT
-       tristate "IA32 a.out support"
-       depends on IA32_EMULATION
-       help
-         Support old a.out binaries in the 32bit emulation.
+        tristate "IA32 a.out support"
+        depends on IA32_EMULATION
+        ---help---
+          Support old a.out binaries in the 32bit emulation.
 
 config COMPAT
         def_bool y