summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2014-02-11 17:47:24 -0800
committerDavid Rientjes <rientjes@google.com>2014-02-11 17:47:48 -0800
commit58f5d2d44883739e43d57334704b7f16f902e463 (patch)
tree2220cd379b24ec5b50cf24f8a33afba1b51f5627 /arch/x86/Kconfig
parentdc9788f40a769d967de3eb5a7aee8c1a70094d32 (diff)
downloadlinux-58f5d2d44883739e43d57334704b7f16f902e463.tar.gz
linux-58f5d2d44883739e43d57334704b7f16f902e463.tar.bz2
linux-58f5d2d44883739e43d57334704b7f16f902e463.zip
x86, apic: Remove support for ia32-based Unisys ES7000
There should no longer be any ia32-based Unisys ES7000 systems 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 system and no indication was given that it should be kept around. Signed-off-by: David Rientjes <rientjes@google.com>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig12
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0af5250d914f..c6a864748c38 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -351,7 +351,6 @@ config X86_EXTENDED_PLATFORM
SGI 320/540 (Visual Workstation)
STA2X11-based (e.g. Northville)
Summit/EXA (IBM x440)
- Unisys ES7000 IA32 series
Moorestown MID devices
If you have one of these systems, or if you want to build a
@@ -489,7 +488,7 @@ config X86_32_NON_STANDARD
depends on X86_32 && SMP
depends on X86_EXTENDED_PLATFORM
---help---
- This option compiles in the NUMAQ, Summit, bigsmp, ES7000,
+ 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.
@@ -555,13 +554,6 @@ config X86_SUMMIT
This option is needed for IBM systems that use the Summit/EXA chipset.
In particular, it is needed for the x440.
-config X86_ES7000
- bool "Unisys ES7000 IA32 series"
- depends on X86_32_NON_STANDARD && X86_BIGSMP
- ---help---
- Support for Unisys ES7000 systems. Say 'Y' here if this kernel is
- supposed to run on an IA32-based Unisys ES7000 system.
-
config X86_32_IRIS
tristate "Eurobraille/Iris poweroff module"
depends on X86_32
@@ -820,7 +812,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 || X86_ES7000)
+ default "32" if SMP && (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP)
default "8" if SMP
---help---
This allows you to specify the maximum number of CPUs which this