Skip to content

Commit 7cf6c94

Browse files
committed
x86, apic: Remove support for IBM Summit/EXA chipset
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>
1 parent 58f5d2d commit 7cf6c94

File tree

5 files changed

+9
-693
lines changed

5 files changed

+9
-693
lines changed

arch/x86/Kconfig

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ config X86_EXTENDED_PLATFORM
350350
RDC R-321x SoC
351351
SGI 320/540 (Visual Workstation)
352352
STA2X11-based (e.g. Northville)
353-
Summit/EXA (IBM x440)
354353
Moorestown MID devices
355354

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

496495
# Alphabetically sorted list of Non standard 32 bit platforms
497496

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

550-
config X86_SUMMIT
551-
bool "Summit/EXA (IBM x440)"
552-
depends on X86_32_NON_STANDARD
553-
---help---
554-
This option is needed for IBM systems that use the Summit/EXA chipset.
555-
In particular, it is needed for the x440.
556-
557549
config X86_32_IRIS
558550
tristate "Eurobraille/Iris poweroff module"
559551
depends on X86_32
@@ -676,14 +668,6 @@ config MEMTEST
676668
memtest=4, mean do 4 test patterns.
677669
If you are unsure how to answer this question, answer N.
678670

679-
config X86_SUMMIT_NUMA
680-
def_bool y
681-
depends on X86_32 && NUMA && X86_32_NON_STANDARD
682-
683-
config X86_CYCLONE_TIMER
684-
def_bool y
685-
depends on X86_SUMMIT
686-
687671
source "arch/x86/Kconfig.cpu"
688672

689673
config HPET_TIMER
@@ -812,7 +796,7 @@ config NR_CPUS
812796
range 2 8192 if SMP && !MAXSMP && CPUMASK_OFFSTACK && X86_64
813797
default "1" if !SMP
814798
default "8192" if MAXSMP
815-
default "32" if SMP && (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP)
799+
default "32" if SMP && (X86_NUMAQ || X86_BIGSMP)
816800
default "8" if SMP
817801
---help---
818802
This allows you to specify the maximum number of CPUs which this
@@ -1232,8 +1216,8 @@ config DIRECT_GBPAGES
12321216
config NUMA
12331217
bool "Numa Memory Allocation and Scheduler Support"
12341218
depends on SMP
1235-
depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI))
1236-
default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP)
1219+
depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP))
1220+
default y if (X86_NUMAQ || X86_BIGSMP)
12371221
---help---
12381222
Enable NUMA (Non Uniform Memory Access) support.
12391223

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

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

12511235
Otherwise, you should say N.
12521236

1253-
comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
1254-
depends on X86_32 && X86_SUMMIT && (!HIGHMEM64G || !ACPI)
1255-
12561237
config AMD_NUMA
12571238
def_bool y
12581239
prompt "Old style AMD Opteron NUMA detection"

arch/x86/kernel/apic/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ endif
1919

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

2524
# For 32bit, probe_32 need to be listed last

0 commit comments

Comments
 (0)