Skip to content

Commit

Permalink
x86, apic: Remove support for IBM Summit/EXA chipset
Browse files Browse the repository at this point in the history
There should no longer be any IBM x440 systems or those using the
Summit/EXA chipset out in the wild, so remove support for it.

We've done our due diligence in reaching out to any contact information
listed for this chipset and no indication was given that it should be
kept around.

Signed-off-by: David Rientjes <rientjes@google.com>
  • Loading branch information
David Rientjes committed Feb 12, 2014
1 parent 58f5d2d commit 7cf6c94
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 693 deletions.
37 changes: 9 additions & 28 deletions arch/x86/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,6 @@ config X86_EXTENDED_PLATFORM
RDC R-321x SoC
SGI 320/540 (Visual Workstation)
STA2X11-based (e.g. Northville)
Summit/EXA (IBM x440)
Moorestown MID devices

If you have one of these systems, or if you want to build a
Expand Down Expand Up @@ -488,10 +487,10 @@ config X86_32_NON_STANDARD
depends on X86_32 && SMP
depends on X86_EXTENDED_PLATFORM
---help---
This option compiles in the NUMAQ, Summit, bigsmp,
STA2X11, default subarchitectures. It is intended for a generic
binary kernel. If you select them all, kernel will probe it
one by one and will fallback to default.
This option compiles in the NUMAQ, bigsmp, and STA2X11 default
subarchitectures. It is intended for a generic binary kernel. If you
select them all, kernel will probe it one by one and will fallback to
default.

# Alphabetically sorted list of Non standard 32 bit platforms

Expand Down Expand Up @@ -547,13 +546,6 @@ config STA2X11
option is selected the kernel will still be able to boot on
standard PC machines.

config X86_SUMMIT
bool "Summit/EXA (IBM x440)"
depends on X86_32_NON_STANDARD
---help---
This option is needed for IBM systems that use the Summit/EXA chipset.
In particular, it is needed for the x440.

config X86_32_IRIS
tristate "Eurobraille/Iris poweroff module"
depends on X86_32
Expand Down Expand Up @@ -676,14 +668,6 @@ config MEMTEST
memtest=4, mean do 4 test patterns.
If you are unsure how to answer this question, answer N.

config X86_SUMMIT_NUMA
def_bool y
depends on X86_32 && NUMA && X86_32_NON_STANDARD

config X86_CYCLONE_TIMER
def_bool y
depends on X86_SUMMIT

source "arch/x86/Kconfig.cpu"

config HPET_TIMER
Expand Down Expand Up @@ -812,7 +796,7 @@ config NR_CPUS
range 2 8192 if SMP && !MAXSMP && CPUMASK_OFFSTACK && X86_64
default "1" if !SMP
default "8192" if MAXSMP
default "32" if SMP && (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP)
default "32" if SMP && (X86_NUMAQ || X86_BIGSMP)
default "8" if SMP
---help---
This allows you to specify the maximum number of CPUs which this
Expand Down Expand Up @@ -1232,8 +1216,8 @@ config DIRECT_GBPAGES
config NUMA
bool "Numa Memory Allocation and Scheduler Support"
depends on SMP
depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI))
default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP)
depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP))
default y if (X86_NUMAQ || X86_BIGSMP)
---help---
Enable NUMA (Non Uniform Memory Access) support.

Expand All @@ -1245,14 +1229,11 @@ config NUMA
(or later), AMD Opteron, or EM64T NUMA.

For 32-bit this is only needed on (rare) 32-bit-only platforms
that support NUMA topologies, such as NUMAQ / Summit, or if you
boot a 32-bit kernel on a 64-bit NUMA platform.
that support NUMA topologies, such as NUMAQ, or if you boot a 32-bit
kernel on a 64-bit NUMA platform.

Otherwise, you should say N.

comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
depends on X86_32 && X86_SUMMIT && (!HIGHMEM64G || !ACPI)

config AMD_NUMA
def_bool y
prompt "Old style AMD Opteron NUMA detection"
Expand Down
1 change: 0 additions & 1 deletion arch/x86/kernel/apic/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ endif

# APIC probe will depend on the listing order here
obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
obj-$(CONFIG_X86_SUMMIT) += summit_32.o
obj-$(CONFIG_X86_BIGSMP) += bigsmp_32.o

# For 32bit, probe_32 need to be listed last
Expand Down
Loading

0 comments on commit 7cf6c94

Please sign in to comment.