Patched in Tegra support.

1 files changed, 147 insertions, 293 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 79795af5981..b8cd5448b0e 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -7,23 +7,17 @@ config 64BIT
           Say no to build a 32-bit kernel - formerly known as i386
 
 config X86_32
-        def_bool y
-        depends on !64BIT
+        def_bool !64BIT
         select CLKSRC_I8253
-        select HAVE_UID16
 
 config X86_64
-        def_bool y
-        depends on 64BIT
-        select X86_DEV_DMA_OPS
+        def_bool 64BIT
 
 ### Arch settings
 config X86
         def_bool y
         select HAVE_AOUT if X86_32
         select HAVE_UNSTABLE_SCHED_CLOCK
-        select ARCH_SUPPORTS_NUMA_BALANCING
-        select ARCH_WANTS_PROT_NUMA_PROT_NONE
         select HAVE_IDE
         select HAVE_OPROFILE
         select HAVE_PCSPKR_PLATFORM
@@ -32,24 +26,20 @@ config X86
         select HAVE_IOREMAP_PROT
         select HAVE_KPROBES
         select HAVE_MEMBLOCK
-        select HAVE_MEMBLOCK_NODE_MAP
-        select ARCH_DISCARD_MEMBLOCK
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARCH_WANT_FRAME_POINTERS
         select HAVE_DMA_ATTRS
-        select HAVE_DMA_CONTIGUOUS if !SWIOTLB
         select HAVE_KRETPROBES
         select HAVE_OPTPROBES
         select HAVE_FTRACE_MCOUNT_RECORD
-        select HAVE_FENTRY if X86_64
         select HAVE_C_RECORDMCOUNT
         select HAVE_DYNAMIC_FTRACE
         select HAVE_FUNCTION_TRACER
         select HAVE_FUNCTION_GRAPH_TRACER
         select HAVE_FUNCTION_GRAPH_FP_TEST
         select HAVE_FUNCTION_TRACE_MCOUNT_TEST
+        select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
         select HAVE_SYSCALL_TRACEPOINTS
-        select SYSCTL_EXCEPTION_TRACE
         select HAVE_KVM
         select HAVE_ARCH_KGDB
         select HAVE_ARCH_TRACEHOOK
@@ -67,57 +57,25 @@ config X86
         select HAVE_MIXED_BREAKPOINTS_REGS
         select PERF_EVENTS
         select HAVE_PERF_EVENTS_NMI
-        select HAVE_PERF_REGS
-        select HAVE_PERF_USER_STACK_DUMP
-        select HAVE_DEBUG_KMEMLEAK
         select ANON_INODES
-        select HAVE_ALIGNED_STRUCT_PAGE if SLUB
-        select HAVE_CMPXCHG_LOCAL
-        select HAVE_CMPXCHG_DOUBLE
         select HAVE_ARCH_KMEMCHECK
         select HAVE_USER_RETURN_NOTIFIER
-        select ARCH_BINFMT_ELF_RANDOMIZE_PIE
         select HAVE_ARCH_JUMP_LABEL
         select HAVE_TEXT_POKE_SMP
         select HAVE_GENERIC_HARDIRQS
-        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
-        select SPARSE_IRQ
+        select HAVE_SPARSE_IRQ
         select GENERIC_FIND_FIRST_BIT
         select GENERIC_IRQ_PROBE
         select GENERIC_PENDING_IRQ if SMP
         select GENERIC_IRQ_SHOW
-        select GENERIC_CLOCKEVENTS_MIN_ADJUST
         select IRQ_FORCED_THREADING
         select USE_GENERIC_SMP_HELPERS if SMP
-        select HAVE_BPF_JIT if X86_64
-        select HAVE_ARCH_TRANSPARENT_HUGEPAGE
+        select HAVE_BPF_JIT if (X86_64 && NET)
         select CLKEVT_I8253
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
-        select GENERIC_IOMAP
-        select DCACHE_WORD_ACCESS
-        select GENERIC_SMP_IDLE_THREAD
-        select ARCH_WANT_IPC_PARSE_VERSION if X86_32
-        select HAVE_ARCH_SECCOMP_FILTER
-        select BUILDTIME_EXTABLE_SORT
-        select GENERIC_CMOS_UPDATE
-        select CLOCKSOURCE_WATCHDOG
-        select GENERIC_CLOCKEVENTS
-        select ARCH_CLOCKSOURCE_DATA if X86_64
-        select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 || (X86_32 && X86_LOCAL_APIC)
-        select GENERIC_TIME_VSYSCALL if X86_64
-        select KTIME_SCALAR if X86_32
-        select GENERIC_STRNCPY_FROM_USER
-        select GENERIC_STRNLEN_USER
-        select HAVE_CONTEXT_TRACKING if X86_64
-        select HAVE_IRQ_TIME_ACCOUNTING
-        select MODULES_USE_ELF_REL if X86_32
-        select MODULES_USE_ELF_RELA if X86_64
-        select CLONE_BACKWARDS if X86_32
-        select GENERIC_SIGALTSTACK
 
 config INSTRUCTION_DECODER
-        def_bool y
-        depends on KPROBES || PERF_EVENTS || UPROBES
+        def_bool (KPROBES || PERF_EVENTS)
 
 config OUTPUT_FORMAT
         string
@@ -129,6 +87,23 @@ config ARCH_DEFCONFIG
         default "arch/x86/configs/i386_defconfig" if X86_32
         default "arch/x86/configs/x86_64_defconfig" if X86_64
 
+config GENERIC_CMOS_UPDATE
+        def_bool y
+
+config CLOCKSOURCE_WATCHDOG
+        def_bool y
+
+config GENERIC_CLOCKEVENTS
+        def_bool y
+
+config ARCH_CLOCKSOURCE_DATA
+        def_bool y
+        depends on X86_64
+
+config GENERIC_CLOCKEVENTS_BROADCAST
+        def_bool y
+        depends on X86_64 || (X86_32 && X86_LOCAL_APIC)
+
 config LOCKDEP_SUPPORT
         def_bool y
 
@@ -141,19 +116,30 @@ config HAVE_LATENCYTOP_SUPPORT
 config MMU
         def_bool y
 
+config ZONE_DMA
+        bool "DMA memory allocation support" if EXPERT
+        default y
+        help
+          DMA memory allocation support allows devices with less than 32-bit
+          addressing to allocate within the first 16MB of address space.
+          Disable if no such devices will be used.
+
+          If unsure, say Y.
+
 config SBUS
         bool
 
 config NEED_DMA_MAP_STATE
-        def_bool y
-        depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG
+       def_bool (X86_64 || INTEL_IOMMU || DMA_API_DEBUG)
 
 config NEED_SG_DMA_LENGTH
         def_bool y
 
 config GENERIC_ISA_DMA
+        def_bool ISA_DMA_API
+
+config GENERIC_IOMAP
         def_bool y
-        depends on ISA_DMA_API
 
 config GENERIC_BUG
         def_bool y
@@ -170,15 +156,24 @@ config GENERIC_GPIO
         bool
 
 config ARCH_MAY_HAVE_PC_FDC
-        def_bool y
-        depends on ISA_DMA_API
+        def_bool ISA_DMA_API
+
+config RWSEM_GENERIC_SPINLOCK
+        def_bool !X86_XADD
 
 config RWSEM_XCHGADD_ALGORITHM
+        def_bool X86_XADD
+
+config ARCH_HAS_CPU_IDLE_WAIT
         def_bool y
 
 config GENERIC_CALIBRATE_DELAY
         def_bool y
 
+config GENERIC_TIME_VSYSCALL
+        bool
+        default X86_64
+
 config ARCH_HAS_CPU_RELAX
         def_bool y
 
@@ -188,9 +183,6 @@ config ARCH_HAS_DEFAULT_IDLE
 config ARCH_HAS_CACHE_LINE_SIZE
         def_bool y
 
-config ARCH_HAS_CPU_AUTOPROBE
-        def_bool y
-
 config HAVE_SETUP_PER_CPU_AREA
         def_bool y
 
@@ -200,6 +192,9 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK
 config NEED_PER_CPU_PAGE_FIRST_CHUNK
         def_bool y
 
+config HAVE_CPUMASK_OF_CPU_MAP
+        def_bool X86_64_SMP
+
 config ARCH_HIBERNATION_POSSIBLE
         def_bool y
 
@@ -210,6 +205,9 @@ config ZONE_DMA32
         bool
         default X86_64
 
+config ARCH_POPULATES_NODE_MAP
+        def_bool y
+
 config AUDIT_ARCH
         bool
         default X86_64
@@ -245,27 +243,19 @@ config ARCH_HWEIGHT_CFLAGS
         default "-fcall-saved-ecx -fcall-saved-edx" if X86_32
         default "-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" if X86_64
 
+config KTIME_SCALAR
+        def_bool X86_32
+
 config ARCH_CPU_PROBE_RELEASE
         def_bool y
         depends on HOTPLUG_CPU
 
-config ARCH_SUPPORTS_UPROBES
-        def_bool y
-
 source "init/Kconfig"
 source "kernel/Kconfig.freezer"
 
 menu "Processor type and features"
 
-config ZONE_DMA
-        bool "DMA memory allocation support" if EXPERT
-        default y
-        help
-          DMA memory allocation support allows devices with less than 32-bit
-          addressing to allocate within the first 16MB of address space.
-          Disable if no such devices will be used.
-
-          If unsure, say Y.
+source "kernel/time/Kconfig"
 
 config SMP
         bool "Symmetric multi-processing support"
@@ -289,7 +279,7 @@ config SMP
           Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
           Management" code will be disabled if you say Y here.
 
-          See also <file:Documentation/x86/i386/IO-APIC.txt>,
+          See also <file:Documentation/i386/IO-APIC.txt>,
           <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
           <http://www.tldp.org/docs.html#howto>.
 
@@ -307,7 +297,7 @@ config X86_X2APIC
           If you don't know what to do here, say N.
 
 config X86_MPPARSE
-        bool "Enable MPS table" if ACPI || SFI
+        bool "Enable MPS table" if ACPI
         default y
         depends on X86_LOCAL_APIC
         ---help---
@@ -335,7 +325,6 @@ config X86_EXTENDED_PLATFORM
                 NUMAQ (IBM/Sequent)
                 RDC R-321x SoC
                 SGI 320/540 (Visual Workstation)
-                STA2X11-based (e.g. Northville)
                 Summit/EXA (IBM x440)
                 Unisys ES7000 IA32 series
                 Moorestown MID devices
@@ -355,7 +344,6 @@ config X86_EXTENDED_PLATFORM
 
           If you enable this option then you'll be able to select support
           for the following (non-PC) 64 bit x86 platforms:
-                Numascale NumaChip
                 ScaleMP vSMP
                 SGI Ultraviolet
 
@@ -364,18 +352,6 @@ config X86_EXTENDED_PLATFORM
 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_NUMACHIP
-        bool "Numascale NumaChip"
-        depends on X86_64
-        depends on X86_EXTENDED_PLATFORM
-        depends on NUMA
-        depends on SMP
-        depends on X86_X2APIC
-        depends on PCI_MMCONFIG
-        ---help---
-          Adds support for Numascale NumaChip large-SMP systems. Needed to
-          enable more than ~168 cores.
-          If you don't have one of these, you should say N here.
 
 config X86_VSMP
         bool "ScaleMP vSMP"
@@ -383,7 +359,6 @@ config X86_VSMP
         select PARAVIRT
         depends on X86_64 && PCI
         depends on X86_EXTENDED_PLATFORM
-        depends on SMP
         ---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
@@ -411,13 +386,12 @@ config X86_INTEL_CE
         select X86_REBOOTFIXUPS
         select OF
         select OF_EARLY_FLATTREE
-        select IRQ_DOMAIN
         ---help---
           Select for the Intel CE media processor (CE4100) SOC.
           This option compiles in support for the CE4100 SOC for settop
           boxes and media devices.
 
-config X86_WANT_INTEL_MID
+config X86_INTEL_MID
         bool "Intel MID platform support"
         depends on X86_32
         depends on X86_EXTENDED_PLATFORM
@@ -426,30 +400,24 @@ config X86_WANT_INTEL_MID
           systems which do not have the PCI legacy interfaces (Moorestown,
           Medfield). If you are building for a PC class system say N here.
 
-if X86_WANT_INTEL_MID
+if X86_INTEL_MID
 
-config X86_INTEL_MID
-        bool
-
-config X86_MDFLD
-       bool "Medfield MID platform"
+config X86_MRST
+       bool "Moorestown MID platform"
         depends on PCI
         depends on PCI_GOANY
         depends on X86_IO_APIC
-        select X86_INTEL_MID
-        select SFI
-        select DW_APB_TIMER
         select APB_TIMER
         select I2C
         select SPI
         select INTEL_SCU_IPC
         select X86_PLATFORM_DEVICES
-        select MFD_INTEL_MSIC
         ---help---
-          Medfield is Intel's Low Power Intel Architecture (LPIA) based Moblin
-          Internet Device(MID) platform. 
-          Unlike standard x86 PCs, Medfield does not have many legacy devices
-          nor standard legacy replacement devices/features. e.g. Medfield does
+          Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin
+          Internet Device(MID) platform. Moorestown consists of two chips:
+          Lincroft (CPU core, graphics, and memory controller) and Langwell IOH.
+          Unlike standard x86 PCs, Moorestown does not have many legacy devices
+          nor standard legacy replacement devices/features. e.g. Moorestown does
           not contain i8259, i8254, HPET, legacy BIOS, most of the io ports.
 
 endif
@@ -470,10 +438,10 @@ config X86_32_NON_STANDARD
         depends on X86_32 && SMP
         depends on X86_EXTENDED_PLATFORM
         ---help---
-          This option compiles in the NUMAQ, Summit, bigsmp, ES7000,
-          STA2X11, 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.
+          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.
 
 # Alphabetically sorted list of Non standard 32 bit platforms
 
@@ -513,22 +481,6 @@ 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 STA2X11
-        bool "STA2X11 Companion Chip Support"
-        depends on X86_32_NON_STANDARD && PCI
-        select X86_DEV_DMA_OPS
-        select X86_DMA_REMAP
-        select SWIOTLB
-        select MFD_STA2X11
-        select ARCH_REQUIRE_GPIOLIB
-        default n
-        ---help---
-          This adds support for boards based on the STA2X11 IO-Hub,
-          a.k.a. "ConneXt". The chip is used in place of the standard
-          PC chipset, so all "standard" peripherals are missing. If this
-          option is selected the kernel will still be able to boot on
-          standard PC machines.
-
 config X86_SUMMIT
         bool "Summit/EXA (IBM x440)"
         depends on X86_32_NON_STANDARD
@@ -592,18 +544,23 @@ config PARAVIRT_TIME_ACCOUNTING
 
 source "arch/x86/xen/Kconfig"
 
-config KVM_GUEST
-        bool "KVM Guest support (including kvmclock)"
-        select PARAVIRT
+config KVM_CLOCK
+        bool "KVM paravirtualized clock"
         select PARAVIRT
         select PARAVIRT_CLOCK
-        default y if PARAVIRT_GUEST
+        ---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
+          provides the guest with timing infrastructure such as time of day, and
+          system time
+
+config KVM_GUEST
+        bool "KVM Guest support"
+        select PARAVIRT
         ---help---
           This option enables various optimizations for running under the KVM
-          hypervisor. It includes a paravirtualized clock, so that instead
-          of relying on a PIT (or probably other) emulation by the
-          underlying device model, the host provides the guest with
-          timing infrastructure such as time of day, and system time
+          hypervisor.
 
 source "arch/x86/lguest/Kconfig"
 
@@ -660,7 +617,7 @@ config X86_SUMMIT_NUMA
 
 config X86_CYCLONE_TIMER
         def_bool y
-        depends on X86_SUMMIT
+        depends on X86_32_NON_STANDARD
 
 source "arch/x86/Kconfig.cpu"
 
@@ -688,10 +645,9 @@ config HPET_EMULATE_RTC
         depends on HPET_TIMER && (RTC=y || RTC=m || RTC_DRV_CMOS=m || RTC_DRV_CMOS=y)
 
 config APB_TIMER
-       def_bool y if X86_INTEL_MID
-       prompt "Intel MID APB Timer Support" if X86_INTEL_MID
+       def_bool y if MRST
+       prompt "Langwell APB Timer Support" if X86_MRST
        select DW_APB_TIMER
-       depends on X86_INTEL_MID && SFI
        help
          APB timer is the replacement for 8254, HPET on X86 MID platforms.
          The APBT provides a stable time base on SMP
@@ -760,14 +716,13 @@ config SWIOTLB
         def_bool y if X86_64
         ---help---
           Support for software bounce buffers used on x86-64 systems
-          which don't have a hardware IOMMU. Using this PCI devices
-          which can only access 32-bits of memory can be used on systems
-          with more than 3 GB of memory.
-          If unsure, say Y.
+          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
+          access 32-bits of memory can be used on systems with more than
+          3 GB of memory. If unsure, say Y.
 
 config IOMMU_HELPER
-        def_bool y
-        depends on CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU
+        def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)
 
 config MAXSMP
         bool "Enable Maximum number of SMP Processors and NUMA Nodes"
@@ -811,6 +766,17 @@ config SCHED_MC
           making when dealing with multi-core CPU chips at a cost of slightly
           increased overhead in some places. If unsure say N here.
 
+config IRQ_TIME_ACCOUNTING
+        bool "Fine granularity task level IRQ time accounting"
+        default n
+        ---help---
+          Select this option to enable fine granularity task irq time
+          accounting. This is done by reading a timestamp on each
+          transitions between softirq and hardirq state, so there can be a
+          small performance impact.
+
+          If in doubt, say N here.
+
 source "kernel/Kconfig.preempt"
 
 config X86_UP_APIC
@@ -875,7 +841,6 @@ config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
 
 config X86_MCE
         bool "Machine Check / overheating reporting"
-        default y
         ---help---
           Machine Check support allows the processor to notify the
           kernel if it detects a problem (e.g. overheating, data corruption).
@@ -987,25 +952,25 @@ config X86_REBOOTFIXUPS
           Say N otherwise.
 
 config MICROCODE
-        tristate "CPU microcode loading support"
+        tristate "/dev/cpu/microcode - microcode support"
         select FW_LOADER
         ---help---
-
           If you say Y here, you will be able to update the microcode on
           certain Intel and AMD processors. The Intel support is for the
-          IA32 family, e.g. Pentium Pro, Pentium II, Pentium III, Pentium 4,
-          Xeon etc. The AMD support is for families 0x10 and later. You will
-          obviously need the actual microcode binary data itself which is not
-          shipped with the Linux kernel.
+          IA32 family, e.g. Pentium Pro, Pentium II, Pentium III,
+          Pentium 4, Xeon etc. The AMD support is for family 0x10 and
+          0x11 processors, e.g. Opteron, Phenom and Turion 64 Ultra.
+          You will obviously need the actual microcode binary data itself
+          which is not shipped with the Linux kernel.
 
           This option selects the general module only, you need to select
           at least one vendor specific module as well.
 
-          To compile this driver as a module, choose M here: the module
-          will be called microcode.
+          To compile this driver as a module, choose M here: the
+          module will be called microcode.
 
 config MICROCODE_INTEL
-        bool "Intel microcode loading support"
+        bool "Intel microcode patch loading support"
         depends on MICROCODE
         default MICROCODE
         select FW_LOADER
@@ -1018,7 +983,7 @@ config MICROCODE_INTEL
           <http://www.urbanmyth.org/microcode/>.
 
 config MICROCODE_AMD
-        bool "AMD microcode loading support"
+        bool "AMD microcode patch loading support"
         depends on MICROCODE
         select FW_LOADER
         ---help---
@@ -1098,7 +1063,7 @@ config HIGHMEM4G
 
 config HIGHMEM64G
         bool "64GB"
-        depends on !M486
+        depends on !M386 && !M486
         select X86_PAE
         ---help---
           Select this if you have a 32-bit processor and more than 4
@@ -1164,12 +1129,10 @@ config X86_PAE
           consumes more pagetable space per process.
 
 config ARCH_PHYS_ADDR_T_64BIT
-        def_bool y
-        depends on X86_64 || X86_PAE
+        def_bool X86_64 || X86_PAE
 
 config ARCH_DMA_ADDR_T_64BIT
-        def_bool y
-        depends on X86_64 || HIGHMEM64G
+        def_bool X86_64 || HIGHMEM64G
 
 config DIRECT_GBPAGES
         bool "Enable 1GB pages for kernel pagetables" if EXPERT
@@ -1253,6 +1216,10 @@ config NODES_SHIFT
           Specify the maximum number of NUMA Nodes available on the target
           system.  Increases memory reserved to accommodate various tables.
 
+config HAVE_ARCH_BOOTMEM
+        def_bool y
+        depends on X86_32 && NUMA
+
 config HAVE_ARCH_ALLOC_REMAP
         def_bool y
         depends on X86_32 && NUMA
@@ -1292,8 +1259,8 @@ config ARCH_SELECT_MEMORY_MODEL
         depends on ARCH_SPARSEMEM_ENABLE
 
 config ARCH_MEMORY_PROBE
-        def_bool y
-        depends on X86_64 && MEMORY_HOTPLUG
+        def_bool X86_64
+        depends on MEMORY_HOTPLUG
 
 config ARCH_PROC_KCORE_TEXT
         def_bool y
@@ -1485,26 +1452,6 @@ config ARCH_USES_PG_UNCACHED
         def_bool y
         depends on X86_PAT
 
-config ARCH_RANDOM
-        def_bool y
-        prompt "x86 architectural random number generator" if EXPERT
-        ---help---
-          Enable the x86 architectural RDRAND instruction
-          (Intel Bull Mountain technology) to generate random numbers.
-          If supported, this is a high bandwidth, cryptographically
-          secure hardware random number generator.
-
-config X86_SMAP
-        def_bool y
-        prompt "Supervisor Mode Access Prevention" if EXPERT
-        ---help---
-          Supervisor Mode Access Prevention (SMAP) is a security
-          feature in newer Intel processors.  There is a small
-          performance cost if this enabled and turned on; there is
-          also a small increase in the kernel size if this is enabled.
-
-          If unsure, say Y.
-
 config EFI
         bool "EFI runtime service support"
         depends on ACPI
@@ -1519,15 +1466,6 @@ config EFI
           resultant kernel should continue to boot on existing non-EFI
           platforms.
 
-config EFI_STUB
-       bool "EFI stub support"
-       depends on EFI
-       ---help---
-          This kernel feature allows a bzImage to be loaded directly
-          by EFI firmware without the use of a bootloader.
-
-          See Documentation/x86/efi-stub.txt for more information.
-
 config SECCOMP
         def_bool y
         prompt "Enable seccomp to safely compute untrusted bytecode"
@@ -1545,7 +1483,7 @@ config SECCOMP
           If unsure, say Y. Only embedded should say N here.
 
 config CC_STACKPROTECTOR
-        bool "Enable -fstack-protector buffer overflow detection"
+        bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
         ---help---
           This option turns on the -fstack-protector GCC feature. This
           feature puts, at the beginning of functions, a canary value on
@@ -1696,50 +1634,6 @@ config HOTPLUG_CPU
             automatically on SMP systems. )
           Say N if you want to disable CPU hotplug.
 
-config BOOTPARAM_HOTPLUG_CPU0
-        bool "Set default setting of cpu0_hotpluggable"
-        default n
-        depends on HOTPLUG_CPU && EXPERIMENTAL
-        ---help---
-          Set whether default state of cpu0_hotpluggable is on or off.
-
-          Say Y here to enable CPU0 hotplug by default. If this switch
-          is turned on, there is no need to give cpu0_hotplug kernel
-          parameter and the CPU0 hotplug feature is enabled by default.
-
-          Please note: there are two known CPU0 dependencies if you want
-          to enable the CPU0 hotplug feature either by this switch or by
-          cpu0_hotplug kernel parameter.
-
-          First, resume from hibernate or suspend always starts from CPU0.
-          So hibernate and suspend are prevented if CPU0 is offline.
-
-          Second dependency is PIC interrupts always go to CPU0. CPU0 can not
-          offline if any interrupt can not migrate out of CPU0. There may
-          be other CPU0 dependencies.
-
-          Please make sure the dependencies are under your control before
-          you enable this feature.
-
-          Say N if you don't want to enable CPU0 hotplug feature by default.
-          You still can enable the CPU0 hotplug feature at boot by kernel
-          parameter cpu0_hotplug.
-
-config DEBUG_HOTPLUG_CPU0
-        def_bool n
-        prompt "Debug CPU0 hotplug"
-        depends on HOTPLUG_CPU && EXPERIMENTAL
-        ---help---
-          Enabling this option offlines CPU0 (if CPU0 can be offlined) as
-          soon as possible and boots up userspace with CPU0 offlined. User
-          can online CPU0 back after boot time.
-
-          To debug CPU0 hotplug, you need to enable CPU0 offline/online
-          feature by either turning on CONFIG_BOOTPARAM_HOTPLUG_CPU0 during
-          compilation or giving cpu0_hotplug kernel parameter at boot.
-
-          If unsure, say N.
-
 config COMPAT_VDSO
         def_bool y
         prompt "Compat VDSO support"
@@ -1824,7 +1718,7 @@ source "drivers/sfi/Kconfig"
 
 config X86_APM_BOOT
         def_bool y
-        depends on APM
+        depends on APM || APM_MODULE
 
 menuconfig APM
         tristate "APM (Advanced Power Management) BIOS support"
@@ -2037,6 +1931,7 @@ config PCI_MMCONFIG
 
 config PCI_CNB20LE_QUIRK
         bool "Read CNB20LE Host Bridge Windows" if EXPERT
+        default n
         depends on PCI && EXPERIMENTAL
         help
           Read the PCI windows out of the CNB20LE host bridge. This allows
@@ -2089,6 +1984,16 @@ config EISA
 
 source "drivers/eisa/Kconfig"
 
+config MCA
+        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
+          there) before attempting to build an MCA bus kernel.
+
+source "drivers/mca/Kconfig"
+
 config SCx200
         tristate "NatSemi SCx200 support"
         ---help---
@@ -2116,7 +2021,6 @@ config OLPC
         select GPIOLIB
         select OF
         select OF_PROMTREE
-        select IRQ_DOMAIN
         ---help---
           Add support for detecting the unique features of the OLPC
           XO hardware.
@@ -2160,33 +2064,6 @@ config OLPC_XO15_SCI
            - AC adapter status updates
            - Battery status updates
 
-config ALIX
-        bool "PCEngines ALIX System Support (LED setup)"
-        select GPIOLIB
-        ---help---
-          This option enables system support for the PCEngines ALIX.
-          At present this just sets up LEDs for GPIO control on
-          ALIX2/3/6 boards.  However, other system specific setup should
-          get added here.
-
-          Note: You must still enable the drivers for GPIO and LED support
-          (GPIO_CS5535 & LEDS_GPIO) to actually use the LEDs
-
-          Note: You have to set alix.force=1 for boards with Award BIOS.
-
-config NET5501
-        bool "Soekris Engineering net5501 System Support (LEDS, GPIO, etc)"
-        select GPIOLIB
-        ---help---
-          This option enables system support for the Soekris Engineering net5501.
-
-config GEOS
-        bool "Traverse Technologies GEOS System Support (LEDS, GPIO, etc)"
-        select GPIOLIB
-        depends on DMI
-        ---help---
-          This option enables system support for the Traverse Technologies GEOS.
-
 endif # X86_32
 
 config AMD_NB
@@ -2218,11 +2095,10 @@ config IA32_EMULATION
         bool "IA32 Emulation"
         depends on X86_64
         select COMPAT_BINFMT_ELF
-        select HAVE_UID16
         ---help---
-          Include code to run legacy 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.
+          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"
@@ -2230,36 +2106,22 @@ config IA32_AOUT
         ---help---
           Support old a.out binaries in the 32bit emulation.
 
-config X86_X32
-        bool "x32 ABI for 64-bit mode (EXPERIMENTAL)"
-        depends on X86_64 && IA32_EMULATION && EXPERIMENTAL
-        ---help---
-          Include code to run binaries for the x32 native 32-bit ABI
-          for 64-bit processors.  An x32 process gets access to the
-          full 64-bit register file and wide data path while leaving
-          pointers at 32 bits for smaller memory footprint.
-
-          You will need a recent binutils (2.22 or later) with
-          elf32_x86_64 support enabled to compile a kernel with this
-          option set.
-
 config COMPAT
         def_bool y
-        depends on IA32_EMULATION || X86_X32
-        select ARCH_WANT_OLD_COMPAT_IPC
+        depends on IA32_EMULATION
 
-if COMPAT
 config COMPAT_FOR_U64_ALIGNMENT
-        def_bool y
+        def_bool COMPAT
+        depends on X86_64
 
 config SYSVIPC_COMPAT
         def_bool y
-        depends on SYSVIPC
+        depends on COMPAT && SYSVIPC
 
 config KEYS_COMPAT
-        def_bool y
-        depends on KEYS
-endif
+        bool
+        depends on COMPAT && KEYS
+        default y
 
 endmenu
 
@@ -2272,14 +2134,6 @@ config HAVE_TEXT_POKE_SMP
         bool
         select STOP_MACHINE if SMP
 
-config X86_DEV_DMA_OPS
-        bool
-        depends on X86_64 || STA2X11
-
-config X86_DMA_REMAP
-        bool
-        depends on STA2X11
-
 source "net/Kconfig"
 
 source "drivers/Kconfig"