Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Skip cpus with apic-ids >= 255 in !x2apic_mode
  x86, x2apic: Allow "nox2apic" to disable x2apic mode setup by BIOS
  x86, x2apic: Fallback to xapic when BIOS doesn't setup interrupt-remapping
  x86, acpi: Skip acpi x2apic entries if the x2apic feature is not present
  x86, apic: Add probe() for apic_flat
  x86: Simplify code by removing a !SMP #ifdefs from 'struct cpuinfo_x86'
  x86: Convert per-cpu counter icr_read_retry_count into a member of irq_stat
  x86: Add per-cpu stat counter for APIC ICR read tries
  pci, x86/io-apic: Allow PCI_IOAPIC to be user configurable on x86
  x86: Fix the !CONFIG_NUMA build of the new CPU ID fixup code support
  x86: Add NumaChip support
  x86: Add x86_init platform override to fix up NUMA core numbering
  x86: Make flat_init_apic_ldr() available

1 files changed, 13 insertions, 0 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 67d6af3581bc..5731eb70e0a0 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -342,6 +342,7 @@ 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
 
@@ -350,6 +351,18 @@ 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 !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"