x86: remove subarchitecture support code

Remove remaining bits of the subarchitecture code. Now that all the
special platforms are runtime probed and runtime handled, we can remove
these facilities.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 0 insertions, 156 deletions

diff --git a/arch/x86/mach-generic/probe.c b/arch/x86/mach-generic/probe.c
deleted file mode 100644
index c03c72221320..000000000000
--- a/arch/x86/mach-generic/probe.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright 2003 Andi Kleen, SuSE Labs.
- * Subject to the GNU Public License, v.2
- *
- * Generic x86 APIC driver probe layer.
- */
-#include <linux/threads.h>
-#include <linux/cpumask.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-#include <linux/ctype.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <asm/fixmap.h>
-#include <asm/mpspec.h>
-#include <asm/apicdef.h>
-#include <asm/genapic.h>
-#include <asm/setup.h>
-
-extern struct genapic apic_numaq;
-extern struct genapic apic_summit;
-extern struct genapic apic_bigsmp;
-extern struct genapic apic_es7000;
-extern struct genapic apic_default;
-
-struct genapic *apic = &apic_default;
-
-static struct genapic *apic_probe[] __initdata = {
-#ifdef CONFIG_X86_NUMAQ
-        &apic_numaq,
-#endif
-#ifdef CONFIG_X86_SUMMIT
-        &apic_summit,
-#endif
-#ifdef CONFIG_X86_BIGSMP
-        &apic_bigsmp,
-#endif
-#ifdef CONFIG_X86_ES7000
-        &apic_es7000,
-#endif
-        &apic_default,  /* must be last */
-        NULL,
-};
-
-static int cmdline_apic __initdata;
-static int __init parse_apic(char *arg)
-{
-        int i;
-
-        if (!arg)
-                return -EINVAL;
-
-        for (i = 0; apic_probe[i]; i++) {
-                if (!strcmp(apic_probe[i]->name, arg)) {
-                        apic = apic_probe[i];
-                        cmdline_apic = 1;
-                        return 0;
-                }
-        }
-
-        if (x86_quirks->update_genapic)
-                x86_quirks->update_genapic();
-
-        /* Parsed again by __setup for debug/verbose */
-        return 0;
-}
-early_param("apic", parse_apic);
-
-void __init generic_bigsmp_probe(void)
-{
-#ifdef CONFIG_X86_BIGSMP
-        /*
-         * This routine is used to switch to bigsmp mode when
-         * - There is no apic= option specified by the user
-         * - generic_apic_probe() has chosen apic_default as the sub_arch
-         * - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support
-         */
-
-        if (!cmdline_apic && apic == &apic_default) {
-                if (apic_bigsmp.probe()) {
-                        apic = &apic_bigsmp;
-                        if (x86_quirks->update_genapic)
-                                x86_quirks->update_genapic();
-                        printk(KERN_INFO "Overriding APIC driver with %s\n",
-                               apic->name);
-                }
-        }
-#endif
-}
-
-void __init generic_apic_probe(void)
-{
-        if (!cmdline_apic) {
-                int i;
-                for (i = 0; apic_probe[i]; i++) {
-                        if (apic_probe[i]->probe()) {
-                                apic = apic_probe[i];
-                                break;
-                        }
-                }
-                /* Not visible without early console */
-                if (!apic_probe[i])
-                        panic("Didn't find an APIC driver");
-
-                if (x86_quirks->update_genapic)
-                        x86_quirks->update_genapic();
-        }
-        printk(KERN_INFO "Using APIC driver %s\n", apic->name);
-}
-
-/* These functions can switch the APIC even after the initial ->probe() */
-
-int __init
-generic_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
-{
-        int i;
-
-        for (i = 0; apic_probe[i]; ++i) {
-                if (!apic_probe[i]->mps_oem_check)
-                        continue;
-                if (!apic_probe[i]->mps_oem_check(mpc, oem, productid))
-                        continue;
-
-                if (!cmdline_apic) {
-                        apic = apic_probe[i];
-                        if (x86_quirks->update_genapic)
-                                x86_quirks->update_genapic();
-                        printk(KERN_INFO "Switched to APIC driver `%s'.\n",
-                               apic->name);
-                }
-                return 1;
-        }
-        return 0;
-}
-
-int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
-{
-        int i;
-
-        for (i = 0; apic_probe[i]; ++i) {
-                if (!apic_probe[i]->acpi_madt_oem_check)
-                        continue;
-                if (!apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id))
-                        continue;
-
-                if (!cmdline_apic) {
-                        apic = apic_probe[i];
-                        if (x86_quirks->update_genapic)
-                                x86_quirks->update_genapic();
-                        printk(KERN_INFO "Switched to APIC driver `%s'.\n",
-                               apic->name);
-                }
-                return 1;
-        }
-        return 0;
-}