Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
  x86: Kconfig: drop unknown symbol 'APM_MODULE'

diff --combined arch/x86/Kconfig
index 5731eb70e0a0642d422ad8653cd7725b762757d0,771a1852a07d856f6fea872467b8fc611f71e571..1d2a69dd36d89c32e16cbe19d6062d5da95f4d52
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -26,8 -26,6 +26,8 @@@ config X8
        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
@@@ -66,12 -64,10 +66,12 @@@
        select HAVE_TEXT_POKE_SMP
        select HAVE_GENERIC_HARDIRQS
        select HAVE_SPARSE_IRQ
 +      select 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 && NET)
@@@ -134,7 -130,7 +134,7 @@@ config SBU
        bool
  
  config NEED_DMA_MAP_STATE
 -       def_bool (X86_64 || DMAR || DMA_API_DEBUG)
 +       def_bool (X86_64 || INTEL_IOMMU || DMA_API_DEBUG)
  
  config NEED_SG_DMA_LENGTH
        def_bool y
@@@ -196,6 -192,9 +196,6 @@@ config NEED_PER_CPU_EMBED_FIRST_CHUN
  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
  
@@@ -206,6 -205,9 +206,6 @@@ config ZONE_DMA3
        bool
        default X86_64
  
 -config ARCH_POPULATES_NODE_MAP
 -      def_bool y
 -
  config AUDIT_ARCH
        bool
        default X86_64
@@@ -218,7 -220,7 +218,7 @@@ config ARCH_SUPPORTS_DEBUG_PAGEALLO
  
  config HAVE_INTEL_TXT
        def_bool y
 -      depends on EXPERIMENTAL && DMAR && ACPI
 +      depends on EXPERIMENTAL && INTEL_IOMMU && ACPI
  
  config X86_32_SMP
        def_bool y
@@@ -277,7 -279,7 +277,7 @@@ config SM
          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/i386/IO-APIC.txt>,
 +        See also <file:Documentation/x86/i386/IO-APIC.txt>,
          <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
          <http://www.tldp.org/docs.html#howto>.
  
@@@ -285,7 -287,7 +285,7 @@@
  
  config X86_X2APIC
        bool "Support x2apic"
 -      depends on X86_LOCAL_APIC && X86_64 && INTR_REMAP
 +      depends on X86_LOCAL_APIC && X86_64 && IRQ_REMAP
        ---help---
          This enables x2apic support on CPUs that have this feature.
  
@@@ -342,7 -344,6 +342,7 @@@ config X86_EXTENDED_PLATFOR
  
          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
  
@@@ -351,18 -352,6 +351,18 @@@
  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 !EDAC_AMD64
 +      ---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"
@@@ -402,7 -391,7 +402,7 @@@ config X86_INTEL_C
          This option compiles in support for the CE4100 SOC for settop
          boxes and media devices.
  
 -config X86_INTEL_MID
 +config X86_WANT_INTEL_MID
        bool "Intel MID platform support"
        depends on X86_32
        depends on X86_EXTENDED_PLATFORM
@@@ -411,10 -400,7 +411,10 @@@
          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
 +if X86_WANT_INTEL_MID
 +
 +config X86_INTEL_MID
 +      bool
  
  config X86_MRST
         bool "Moorestown MID platform"
@@@ -426,7 -412,6 +426,7 @@@
        select SPI
        select INTEL_SCU_IPC
        select X86_PLATFORM_DEVICES
 +      select X86_INTEL_MID
        ---help---
          Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin
          Internet Device(MID) platform. Moorestown consists of two chips:
@@@ -1467,15 -1452,6 +1467,15 @@@ config ARCH_USES_PG_UNCACHE
        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 EFI
        bool "EFI runtime service support"
        depends on ACPI
@@@ -1742,7 -1718,7 +1742,7 @@@ source "drivers/sfi/Kconfig
  
  config X86_APM_BOOT
        def_bool y
-       depends on APM || APM_MODULE
+       depends on APM
  
  menuconfig APM
        tristate "APM (Advanced Power Management) BIOS support"
@@@ -2088,20 -2064,6 +2088,20 @@@ config OLPC_XO15_SC
           - 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.
 +
  endif # X86_32
  
  config AMD_NB