1 files changed, 75 insertions, 90 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index da349723d411..6a47bb22657f 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -20,6 +20,7 @@ config X86
         select HAVE_UNSTABLE_SCHED_CLOCK
         select HAVE_IDE
         select HAVE_OPROFILE
+        select HAVE_PCSPKR_PLATFORM
         select HAVE_PERF_EVENTS
         select HAVE_IRQ_WORK
         select HAVE_IOREMAP_PROT
@@ -70,6 +71,8 @@ config X86
         select IRQ_FORCED_THREADING
         select USE_GENERIC_SMP_HELPERS if SMP
         select HAVE_BPF_JIT if (X86_64 && NET)
+        select CLKEVT_I8253
+        select ARCH_HAVE_NMI_SAFE_CMPXCHG
 
 config INSTRUCTION_DECODER
         def_bool (KPROBES || PERF_EVENTS)
@@ -93,6 +96,10 @@ config CLOCKSOURCE_WATCHDOG
 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)
@@ -384,12 +391,21 @@ config X86_INTEL_CE
           This option compiles in support for the CE4100 SOC for settop
           boxes and media devices.
 
+config X86_INTEL_MID
+        bool "Intel MID platform support"
+        depends on X86_32
+        depends on X86_EXTENDED_PLATFORM
+        ---help---
+          Select to build a kernel capable of supporting Intel MID platform
+          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_INTEL_MID
+
 config X86_MRST
        bool "Moorestown MID platform"
         depends on PCI
         depends on PCI_GOANY
-        depends on X86_32
-        depends on X86_EXTENDED_PLATFORM
         depends on X86_IO_APIC
         select APB_TIMER
         select I2C
@@ -404,6 +420,8 @@ config X86_MRST
           nor standard legacy replacement devices/features. e.g. Moorestown does
           not contain i8259, i8254, HPET, legacy BIOS, most of the io ports.
 
+endif
+
 config X86_RDC321X
         bool "RDC R-321x SoC"
         depends on X86_32
@@ -512,6 +530,18 @@ menuconfig PARAVIRT_GUEST
 
 if PARAVIRT_GUEST
 
+config PARAVIRT_TIME_ACCOUNTING
+        bool "Paravirtual steal time accounting"
+        select PARAVIRT
+        default n
+        ---help---
+          Select this option to enable fine granularity task steal time
+          accounting. Time spent executing other tasks in parallel with
+          the current vCPU is discounted from the vCPU power. To account for
+          that, there can be a small performance impact.
+
+          If in doubt, say N here.
+
 source "arch/x86/xen/Kconfig"
 
 config KVM_CLOCK
@@ -617,6 +647,7 @@ config HPET_EMULATE_RTC
 config APB_TIMER
        def_bool y if MRST
        prompt "Langwell APB Timer Support" if X86_MRST
+       select DW_APB_TIMER
        help
          APB timer is the replacement for 8254, HPET on X86 MID platforms.
          The APBT provides a stable time base on SMP
@@ -680,33 +711,6 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT
           Calgary anyway, pass 'iommu=calgary' on the kernel command line.
           If unsure, say Y.
 
-config AMD_IOMMU
-        bool "AMD IOMMU support"
-        select SWIOTLB
-        select PCI_MSI
-        select PCI_IOV
-        depends on X86_64 && PCI && ACPI
-        ---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
-          can isolate the the DMA memory of different devices and protect the
-          system from misbehaving device drivers or hardware.
-
-          You can find out if your system has an AMD IOMMU if you look into
-          your BIOS for an option to enable it or if you have an IVRS ACPI
-          table.
-
-config AMD_IOMMU_STATS
-        bool "Export AMD IOMMU statistics to debugfs"
-        depends on AMD_IOMMU
-        select DEBUG_FS
-        ---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.
-          If unsure, say N.
-
 # need this always selected by IOMMU for the VIA workaround
 config SWIOTLB
         def_bool y if X86_64
@@ -720,9 +724,6 @@ config SWIOTLB
 config IOMMU_HELPER
         def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)
 
-config IOMMU_API
-        def_bool (AMD_IOMMU || DMAR)
-
 config MAXSMP
         bool "Enable Maximum number of SMP Processors and NUMA Nodes"
         depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL
@@ -1170,7 +1171,7 @@ comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
 config AMD_NUMA
         def_bool y
         prompt "Old style AMD Opteron NUMA detection"
-        depends on NUMA && PCI
+        depends on X86_64 && NUMA && PCI
         ---help---
           Enable AMD NUMA node topology detection.  You should say Y here if
           you have a multi processor AMD system. This uses an old method to
@@ -1737,8 +1738,8 @@ menuconfig APM
           machines with more than one CPU.
 
           In order to use APM, you will need supporting software. For location
-          and more information, read <file:Documentation/power/pm.txt> and the
-          Battery Powered Linux mini-HOWTO, available from
+          and more information, read <file:Documentation/power/apm-acpi.txt>
+          and the Battery Powered Linux mini-HOWTO, available from
           <http://www.tldp.org/docs.html#howto>.
 
           This driver does not spin down disk drives (see the hdparm(8)
@@ -1905,7 +1906,7 @@ config PCI_BIOS
 # x86-64 doesn't support PCI BIOS access from long mode so always go direct.
 config PCI_DIRECT
         def_bool y
-        depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY || PCI_GOOLPC))
+        depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY || PCI_GOOLPC || PCI_GOMMCONFIG))
 
 config PCI_MMCONFIG
         def_bool y
@@ -1942,55 +1943,6 @@ config PCI_CNB20LE_QUIRK
 
           You should say N unless you know you need this.
 
-config DMAR
-        bool "Support for DMA Remapping Devices (EXPERIMENTAL)"
-        depends on PCI_MSI && ACPI && EXPERIMENTAL
-        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
-          and include PCI device scope covered by these DMA
-          remapping devices.
-
-config DMAR_DEFAULT_ON
-        def_bool y
-        prompt "Enable DMA Remapping Devices by default"
-        depends on DMAR
-        help
-          Selecting this option will enable a DMAR device at boot time if
-          one is found. If this option is not selected, DMAR support can
-          be enabled by passing intel_iommu=on to the kernel. It is
-          recommended you say N here while the DMAR code remains
-          experimental.
-
-config DMAR_BROKEN_GFX_WA
-        bool "Workaround broken graphics drivers (going away soon)"
-        depends on DMAR && BROKEN
-        ---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, at least until this
-          option is removed in the 2.6.32 kernel.
-
-config DMAR_FLOPPY_WA
-        def_bool y
-        depends on DMAR
-        ---help---
-          Floppy disk drivers are known to bypass DMA API calls
-          thereby failing to work when IOMMU is enabled. This
-          workaround will setup a 1:1 mapping for the first
-          16MiB 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.
-
 source "drivers/pci/pcie/Kconfig"
 
 source "drivers/pci/Kconfig"
@@ -2073,11 +2025,44 @@ config OLPC
           Add support for detecting the unique features of the OLPC
           XO hardware.
 
-config OLPC_XO1
-        tristate "OLPC XO-1 support"
-        depends on OLPC && MFD_CS5535
-        ---help---
-          Add support for non-essential features of the OLPC XO-1 laptop.
+config OLPC_XO1_PM
+        bool "OLPC XO-1 Power Management"
+        depends on OLPC && MFD_CS5535 && PM_SLEEP
+        select MFD_CORE
+        ---help---
+          Add support for poweroff and suspend of the OLPC XO-1 laptop.
+
+config OLPC_XO1_RTC
+        bool "OLPC XO-1 Real Time Clock"
+        depends on OLPC_XO1_PM && RTC_DRV_CMOS
+        ---help---
+          Add support for the XO-1 real time clock, which can be used as a
+          programmable wakeup source.
+
+config OLPC_XO1_SCI
+        bool "OLPC XO-1 SCI extras"
+        depends on OLPC && OLPC_XO1_PM
+        select POWER_SUPPLY
+        select GPIO_CS5535
+        select MFD_CORE
+        ---help---
+          Add support for SCI-based features of the OLPC XO-1 laptop:
+           - EC-driven system wakeups
+           - Power button
+           - Ebook switch
+           - Lid switch
+           - AC adapter status updates
+           - Battery status updates
+
+config OLPC_XO15_SCI
+        bool "OLPC XO-1.5 SCI extras"
+        depends on OLPC && ACPI
+        select POWER_SUPPLY
+        ---help---
+          Add support for SCI-based features of the OLPC XO-1.5 laptop:
+           - EC-driven system wakeups
+           - AC adapter status updates
+           - Battery status updates
 
 endif # X86_32