x86/APIC: drop {acpi_madt,mps}_oem_check() hooks

The hook functions have been empty for a very long time, if not
(according to git history) forever. Ditch them alongside the then empty
mach_mpparse.h instances and the then unused APICFUNC() macro.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c
index 79c6a3e1f8a6742af3f7e841a1a3ed1db5bfcc0e..b101ef096111c2e94c45f4a83e807b8d981230f9 100644 (file)
--- a/xen/arch/x86/acpi/boot.c
+++ b/xen/arch/x86/acpi/boot.c
@@ -39,7 +39,6 @@
 #include <asm/processor.h>
 #include <asm/hpet.h> /* for hpet_address */
 #include <mach_apic.h>
-#include <mach_mpparse.h>
 
 #define PREFIX                 "ACPI: "
 
@@ -75,8 +74,6 @@ static int __init acpi_parse_madt(struct acpi_table_header *table)
                       madt->address);
        }
 
-       acpi_madt_oem_check(madt->header.oem_id, madt->header.oem_table_id);
-
        return 0;
 }
 

diff --git a/xen/arch/x86/genapic/bigsmp.c b/xen/arch/x86/genapic/bigsmp.c
index 6808d61d9cce3a8ff58213ee69a12304a136722a..b9d976e8abf2023f2f61bb169c1338a114c11e7d 100644 (file)
--- a/xen/arch/x86/genapic/bigsmp.c
+++ b/xen/arch/x86/genapic/bigsmp.c
@@ -8,7 +8,6 @@
 #include <xen/smp.h>
 #include <xen/init.h>
 #include <xen/dmi.h>
-#include <asm/mach-default/mach_mpparse.h>
 #include <asm/io_apic.h>
 
 static __init int force_bigsmp(const struct dmi_system_id *d)

diff --git a/xen/arch/x86/genapic/default.c b/xen/arch/x86/genapic/default.c
index 53ebf20a3feac5f0d833b93eb4862db160a67b0e..bfd068cdc69fc4db61faaaa0e24b3d7c917af174 100644 (file)
--- a/xen/arch/x86/genapic/default.c
+++ b/xen/arch/x86/genapic/default.c
@@ -12,7 +12,6 @@
 #include <xen/smp.h>
 #include <xen/init.h>
 #include <asm/io_apic.h>
-#include <asm/mach-default/mach_mpparse.h>
 
 /* should be called last. */
 static __init int probe_default(void)

diff --git a/xen/arch/x86/genapic/probe.c b/xen/arch/x86/genapic/probe.c
index d4d7a554a05498f1909c1f58571550887ee3c35d..b963dc5ec0844ab03e63c0da69195c96fd221852 100644 (file)
--- a/xen/arch/x86/genapic/probe.c
+++ b/xen/arch/x86/genapic/probe.c
@@ -78,39 +78,3 @@ void __init generic_apic_probe(void)
 
        printk(KERN_INFO "Using APIC driver %s\n", genapic.name);
 } 
-
-/* These functions can switch the APIC even after the initial ->probe() */
-
-int __init mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid)
-{ 
-       int i;
-       for (i = 0; apic_probe[i]; ++i) { 
-               if (apic_probe[i]->mps_oem_check(mpc,oem,productid)) { 
-                       if (!cmdline_apic &&
-                            genapic.name != apic_probe[i]->name) {
-                               genapic = *apic_probe[i];
-                               printk(KERN_INFO "Switched to APIC driver `%s'.\n", 
-                                      genapic.name);
-                       }
-                       return 1;
-               } 
-       } 
-       return 0;
-} 
-
-int __init 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(oem_id, oem_table_id)) { 
-                       if (!cmdline_apic &&
-                            genapic.name != apic_probe[i]->name) {
-                               genapic = *apic_probe[i];
-                               printk(KERN_INFO "Switched to APIC driver `%s'.\n", 
-                                      genapic.name);
-                       }
-                       return 1;
-               } 
-       } 
-       return 0;       
-}

diff --git a/xen/arch/x86/genapic/x2apic.c b/xen/arch/x86/genapic/x2apic.c
index 425f1ff46099f38ca794149788bc0e5fb470c62f..9064a0ca46961f2073614092ae01fc00defcb785 100644 (file)
--- a/xen/arch/x86/genapic/x2apic.c
+++ b/xen/arch/x86/genapic/x2apic.c
@@ -27,7 +27,6 @@
 #include <asm/msr.h>
 #include <asm/processor.h>
 #include <xen/smp.h>
-#include <asm/mach-default/mach_mpparse.h>
 
 static DEFINE_PER_CPU_READ_MOSTLY(u32, cpu_2_logical_apicid);
 static DEFINE_PER_CPU_READ_MOSTLY(cpumask_t *, cluster_cpus);

diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c
index 3df8c65f6762e0bec78664500182b37a535096e6..42b5ac7871b882999ba5f117c7c321427562f4e6 100644 (file)
--- a/xen/arch/x86/mpparse.c
+++ b/xen/arch/x86/mpparse.c
@@ -30,7 +30,6 @@
 #include <asm/setup.h>
 
 #include <mach_apic.h>
-#include <mach_mpparse.h>
 #include <bios_ebda.h>
 
 /* Have we found an MP table */
@@ -326,8 +325,6 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
        str[12]=0;
        printk("Product ID: %s ",str);
 
-       mps_oem_check(mpc, oem, str);
-
        printk("APIC at: %#x\n", mpc->mpc_lapic);
 
        /* 

diff --git a/xen/arch/x86/x86_64/acpi_mmcfg.c b/xen/arch/x86/x86_64/acpi_mmcfg.c
index 650140eec5460266cb083c1ae1f1d5dde9530120..0db8f57abbed3fc603d76ed42256a4362dcb510e 100644 (file)
--- a/xen/arch/x86/x86_64/acpi_mmcfg.c
+++ b/xen/arch/x86/x86_64/acpi_mmcfg.c
@@ -38,7 +38,6 @@
 #include <asm/mpspec.h>
 #include <asm/processor.h>
 #include <mach_apic.h>
-#include <mach_mpparse.h>
 
 #include "mmconfig.h"
 

diff --git a/xen/include/asm-x86/genapic.h b/xen/include/asm-x86/genapic.h
index dd7dfe96a3ee93bd3f499e4a462e56e8a19eec26..51a65d3e0f0c7928d0478b30adbc455321c9573c 100644 (file)
--- a/xen/include/asm-x86/genapic.h
+++ b/xen/include/asm-x86/genapic.h
@@ -21,13 +21,6 @@ struct genapic {
        const char *name;
        int (*probe)(void);
 
-       /* When one of the next two hooks returns 1 the genapic
-          is switched to this. Essentially they are additional probe 
-          functions. */
-       int (*mps_oem_check)(struct mp_config_table *mpc, char *oem, 
-                             char *productid);
-       int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id);
-
        /* Interrupt delivery parameters ('physical' vs. 'logical flat'). */
        int int_delivery_mode;
        int int_dest_mode;
@@ -38,13 +31,9 @@ struct genapic {
     void (*send_IPI_self)(uint8_t vector);
 };
 
-#define APICFUNC(x) .x = x
-
 #define APIC_INIT(aname, aprobe) \
        .name = aname, \
-       .probe = aprobe, \
-       APICFUNC(mps_oem_check), \
-       APICFUNC(acpi_madt_oem_check)
+       .probe = aprobe
 
 extern struct genapic genapic;
 extern const struct genapic apic_default;

diff --git a/xen/include/asm-x86/mach-default/mach_mpparse.h b/xen/include/asm-x86/mach-default/mach_mpparse.h
deleted file mode 100644 (file)
index 6194b77..0000000
--- a/xen/include/asm-x86/mach-default/mach_mpparse.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __ASM_MACH_MPPARSE_H
-#define __ASM_MACH_MPPARSE_H
-
-static inline int __init mps_oem_check(struct mp_config_table *mpc, char *oem,
-                                      char *productid)
-{
-       return 0;
-}
-
-/* Hook from generic ACPI tables.c */
-static inline int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
-{
-       return 0;
-}
-
-
-#endif /* __ASM_MACH_MPPARSE_H */

diff --git a/xen/include/asm-x86/mach-generic/mach_mpparse.h b/xen/include/asm-x86/mach-generic/mach_mpparse.h
deleted file mode 100644 (file)
index 92f0974..0000000
--- a/xen/include/asm-x86/mach-generic/mach_mpparse.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _MACH_MPPARSE_H
-#define _MACH_MPPARSE_H 1
-
-int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid);
-int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
-
-#endif