Merge branch 'linus' into x86/core

diff --combined arch/x86/Kconfig
index 0a80d6a5e9f1199fb85b49821f1cb6fee6c69bd1,ed92864d1325c09092f3e8ed4918f26341f23161..21ef9dd36187313b8e183c786bd6649bfa917ae8
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -577,35 -577,29 +577,29 @@@ config SWIOTL
  
  config IOMMU_HELPER
        def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)
+ 
  config MAXSMP
        bool "Configure Maximum number of SMP Processors and NUMA Nodes"
-       depends on X86_64 && SMP
+       depends on X86_64 && SMP && BROKEN
        default n
        help
          Configure maximum number of CPUS and NUMA Nodes for this architecture.
          If unsure, say N.
  
- if MAXSMP
- config NR_CPUS
-       int
-       default "4096"
- endif
- 
- if !MAXSMP
  config NR_CPUS
-       int "Maximum number of CPUs (2-4096)"
-       range 2 4096
+       int "Maximum number of CPUs (2-512)" if !MAXSMP
+       range 2 512
        depends on SMP
+       default "4096" if MAXSMP
        default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000
        default "8"
        help
          This allows you to specify the maximum number of CPUs which this
-         kernel will support.  The maximum supported value is 4096 and the
+         kernel will support.  The maximum supported value is 512 and the
          minimum value which makes sense is 2.
  
          This is purely to save memory - each supported CPU adds
          approximately eight kilobytes to the kernel image.
- endif
  
  config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"
@@@ -996,17 -990,10 +990,10 @@@ config NUMA_EM
          into virtual nodes when booted with "numa=fake=N", where N is the
          number of nodes. This is only useful for debugging.
  
- if MAXSMP
- 
  config NODES_SHIFT
-       int
-       default "9"
- endif
- 
- if !MAXSMP
- config NODES_SHIFT
-       int "Maximum NUMA Nodes (as a power of 2)"
+       int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP
        range 1 9   if X86_64
+       default "9" if MAXSMP
        default "6" if X86_64
        default "4" if X86_NUMAQ
        default "3"
@@@ -1014,7 -1001,6 +1001,6 @@@
        help
          Specify the maximum number of NUMA Nodes available on the target
          system.  Increases memory reserved to accomodate various tables.
- endif
  
  config HAVE_ARCH_BOOTMEM_NODE
        def_bool y
@@@ -1657,14 -1643,6 +1643,14 @@@ config DMAR_FLOPPY_W
         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.
 +
  source "drivers/pci/pcie/Kconfig"
  
  source "drivers/pci/Kconfig"

diff --combined include/asm-x86/kvm_host.h
index 72e9a525f91a64ca5318df5e794c082135a27201,c2e34c27590066e4cf3359b78c1805d6c02805fc..69794547f514f5f249b65acf55ba8d5fd5c12685
--- 1/include/asm-x86/kvm_host.h
--- 2/include/asm-x86/kvm_host.h
+++ b/include/asm-x86/kvm_host.h
@@@ -1,4 -1,4 +1,4 @@@
 -#/*
 +/*
   * Kernel-based Virtual Machine driver for Linux
   *
   * This header defines architecture specific interfaces, x86 version
@@@ -8,8 -8,8 +8,8 @@@
   *
   */
  
 -#ifndef ASM_KVM_HOST_H
 -#define ASM_KVM_HOST_H
 +#ifndef ASM_X86__KVM_HOST_H
 +#define ASM_X86__KVM_HOST_H
  
  #include <linux/types.h>
  #include <linux/mm.h>
@@@ -722,7 -722,7 +722,7 @@@ asmlinkage void kvm_handle_fault_on_reb
  
  #define __kvm_handle_fault_on_reboot(insn) \
        "666: " insn "\n\t" \
-       ".pushsection .text.fixup, \"ax\" \n" \
+       ".pushsection .fixup, \"ax\" \n" \
        "667: \n\t" \
        KVM_EX_PUSH " $666b \n\t" \
        "jmp kvm_handle_fault_on_reboot \n\t" \
@@@ -735,4 -735,4 +735,4 @@@
  int kvm_unmap_hva(struct kvm *kvm, unsigned long hva);
  int kvm_age_hva(struct kvm *kvm, unsigned long hva);
  
 -#endif
 +#endif /* ASM_X86__KVM_HOST_H */