4 files changed, 2 insertions, 761 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
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 1dac94265b59..bcdace45b000 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -907,10 +907,6 @@ static int __init acpi_parse_madt_lapic_entries(void)
 #ifdef  CONFIG_X86_IO_APIC
 #define MP_ISA_BUS              0
 
-#ifdef CONFIG_X86_ES7000
-extern int es7000_plat;
-#endif
-
 void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi)
 {
         int ioapic;
@@ -960,14 +956,6 @@ void __init mp_config_acpi_legacy_irqs(void)
         set_bit(MP_ISA_BUS, mp_bus_not_pci);
         pr_debug("Bus #%d is ISA\n", MP_ISA_BUS);
 
-#ifdef CONFIG_X86_ES7000
-        /*
-         * Older generations of ES7000 have no legacy identity mappings
-         */
-        if (es7000_plat == 1)
-                return;
-#endif
-
         /*
          * Use the default configuration for the IRQs 0-15.  Unless
          * overridden by (MADT) interrupt source override entries.
diff --git a/arch/x86/kernel/apic/Makefile b/arch/x86/kernel/apic/Makefile
index 0ae0323b1f9c..7b600c68ed20 100644
--- a/arch/x86/kernel/apic/Makefile
+++ b/arch/x86/kernel/apic/Makefile
@@ -21,7 +21,6 @@ endif
 obj-$(CONFIG_X86_NUMAQ)         += numaq_32.o
 obj-$(CONFIG_X86_SUMMIT)        += summit_32.o
 obj-$(CONFIG_X86_BIGSMP)        += bigsmp_32.o
-obj-$(CONFIG_X86_ES7000)        += es7000_32.o
 
 # For 32bit, probe_32 need to be listed last
 obj-$(CONFIG_X86_LOCAL_APIC)    += probe_$(BITS).o
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
deleted file mode 100644
index 6f8f8b348a39..000000000000
--- a/arch/x86/kernel/apic/es7000_32.c
+++ /dev/null
@@ -1,738 +0,0 @@
-/*
- * Written by: Garry Forsgren, Unisys Corporation
- *             Natalie Protasevich, Unisys Corporation
- *
- * This file contains the code to configure and interface
- * with Unisys ES7000 series hardware system manager.
- *
- * Copyright (c) 2003 Unisys Corporation.
- * Copyright (C) 2009, Red Hat, Inc., Ingo Molnar
- *
- *   All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Unisys Corporation, Township Line & Union Meeting
- * Roads-A, Unisys Way, Blue Bell, Pennsylvania, 19424, or:
- *
- * http://www.unisys.com
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/notifier.h>
-#include <linux/spinlock.h>
-#include <linux/cpumask.h>
-#include <linux/threads.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/reboot.h>
-#include <linux/string.h>
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/acpi.h>
-#include <linux/init.h>
-#include <linux/gfp.h>
-#include <linux/nmi.h>
-#include <linux/smp.h>
-#include <linux/io.h>
-
-#include <asm/apicdef.h>
-#include <linux/atomic.h>
-#include <asm/fixmap.h>
-#include <asm/mpspec.h>
-#include <asm/setup.h>
-#include <asm/apic.h>
-#include <asm/ipi.h>
-
-/*
- * ES7000 chipsets
- */
-
-#define NON_UNISYS                      0
-#define ES7000_CLASSIC                  1
-#define ES7000_ZORRO                    2
-
-#define MIP_REG                         1
-#define MIP_PSAI_REG                    4
-
-#define MIP_BUSY                        1
-#define MIP_SPIN                        0xf0000
-#define MIP_VALID                       0x0100000000000000ULL
-#define MIP_SW_APIC                     0x1020b
-
-#define MIP_PORT(val)                   ((val >> 32) & 0xffff)
-
-#define MIP_RD_LO(val)                  (val & 0xffffffff)
-
-struct mip_reg {
-        unsigned long long              off_0x00;
-        unsigned long long              off_0x08;
-        unsigned long long              off_0x10;
-        unsigned long long              off_0x18;
-        unsigned long long              off_0x20;
-        unsigned long long              off_0x28;
-        unsigned long long              off_0x30;
-        unsigned long long              off_0x38;
-};
-
-struct mip_reg_info {
-        unsigned long long              mip_info;
-        unsigned long long              delivery_info;
-        unsigned long long              host_reg;
-        unsigned long long              mip_reg;
-};
-
-struct psai {
-        unsigned long long              entry_type;