Merge branches 'x86/mm', 'x86/build', 'x86/apic' and 'x86/platform' into x86/core...

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined arch/x86/Kconfig
index 226d569,4eb0b0f,c3333e5,6bbb991,066d9bd..e68408f
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
--- 3/arch/x86/Kconfig
--- 4/arch/x86/Kconfig
--- 5/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@@@@ -100,7 -100,7 -100,7 -100,7 -100,7 +100,7 @@@@@@ config X8
        select IRQ_FORCED_THREADING
        select HAVE_BPF_JIT if X86_64
        select HAVE_ARCH_TRANSPARENT_HUGEPAGE
- ---   select HAVE_ARCH_HUGE_VMAP if X86_64 || (X86_32 && X86_PAE)
+ +++   select HAVE_ARCH_HUGE_VMAP if X86_64 || X86_PAE
        select ARCH_HAS_SG_CHAIN
        select CLKEVT_I8253
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
@@@@@@ -341,7 -341,7 -341,7 -341,7 -341,7 +341,7 @@@@@@ config X86_FEATURE_NAME
     
     config X86_X2APIC
        bool "Support x2apic"
--- -   depends on X86_LOCAL_APIC && X86_64 && IRQ_REMAP
+++ +   depends on X86_LOCAL_APIC && X86_64 && (IRQ_REMAP || HYPERVISOR_GUEST)
        ---help---
          This enables x2apic support on CPUs that have this feature.
     
@@@@@@ -441,6 -441,6 -441,6 -441,6 -441,7 +441,7 @@@@@@ config X86_U
        depends on X86_EXTENDED_PLATFORM
        depends on NUMA
        depends on X86_X2APIC
++++    depends on PCI
        ---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.
@@@@@@ -466,7 -466,7 -466,7 -466,6 -467,7 +467,6 @@@@@@ config X86_INTEL_C
        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
@@@@@@ -851,11 -851,11 -851,12 -850,11 -852,11 +851,12 @@@@@@ config NR_CPU
        default "1" if !SMP
        default "8192" if MAXSMP
        default "32" if SMP && X86_BIGSMP
-- --   default "8" if SMP
++ ++   default "8" if SMP && X86_32
++ ++   default "64" if SMP
        ---help---
          This allows you to specify the maximum number of CPUs which this
          kernel will support.  If CPUMASK_OFFSTACK is enabled, the maximum
-- --     supported value is 4096, otherwise the maximum value is 512.  The
++ ++     supported value is 8192, otherwise the maximum value is 512.  The
          minimum value which makes sense is 2.
     
          This is purely to save memory - each supported CPU adds
@@@@@@ -914,12 -914,12 -915,12 -913,12 -915,12 +915,12 @@@@@@ config X86_UP_IOAPI
     config X86_LOCAL_APIC
        def_bool y
        depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC || PCI_MSI
--- -   select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ
+++ +   select IRQ_DOMAIN_HIERARCHY
+++ +   select PCI_MSI_IRQ_DOMAIN if PCI_MSI
     
     config X86_IO_APIC
        def_bool y
        depends on X86_LOCAL_APIC || X86_UP_IOAPIC
--- -   select IRQ_DOMAIN
     
     config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
        bool "Reroute for broken boot IRQs"