x86: consolidate the ->mps_oem_check() code

- spread out the mps_oem_check() namespace on a per APIC driver basis

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

6 files changed, 10 insertions, 8 deletions

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index d04b38954df3..6bf6aafeb2c6 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -88,7 +88,7 @@ struct genapic apic_bigsmp = {
         .check_phys_apicid_present      = bigsmp_check_phys_apicid_present,
         .enable_apic_mode               = NULL,
         .phys_pkg_id                    = bigsmp_phys_pkg_id,
-        .mps_oem_check                  = mps_oem_check,
+        .mps_oem_check                  = NULL,
 
         .get_apic_id                    = get_apic_id,
         .set_apic_id                    = NULL,
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index 5c9266f756e0..e5f85cd75b43 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -69,7 +69,7 @@ struct genapic apic_default = {
         .check_phys_apicid_present      = default_check_phys_apicid_present,
         .enable_apic_mode               = NULL,
         .phys_pkg_id                    = default_phys_pkg_id,
-        .mps_oem_check                  = mps_oem_check,
+        .mps_oem_check                  = NULL,
 
         .get_apic_id                    = get_apic_id,
         .set_apic_id                    = NULL,
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 52787e34c9cc..f861163cd396 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -36,11 +36,12 @@ static int probe_es7000(void)
 }
 
 static __init int
-mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
+es7000_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
 {
         if (mpc->oemptr) {
                 struct mpc_oemtable *oem_table =
                         (struct mpc_oemtable *)mpc->oemptr;
+
                 if (!strncmp(oem, "UNISYS", 6))
                         return parse_unisys_oem((char *)oem_table);
         }
@@ -123,7 +124,7 @@ struct genapic apic_es7000 = {
         .check_phys_apicid_present      = es7000_check_phys_apicid_present,
         .enable_apic_mode               = es7000_enable_apic_mode,
         .phys_pkg_id                    = es7000_phys_pkg_id,
-        .mps_oem_check                  = mps_oem_check,
+        .mps_oem_check                  = es7000_mps_oem_check,
 
         .get_apic_id                    = get_apic_id,
         .set_apic_id                    = NULL,
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 6a1134e6d72d..517882c9c15a 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -19,7 +19,7 @@
 #include <asm/numaq/wakecpu.h>
 #include <asm/numaq.h>
 
-static int mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
+static int __numaq_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
 {
         numaq_mps_oem_check(mpc, oem, productid);
         return found_numaq;
@@ -88,7 +88,7 @@ struct genapic apic_numaq = {
         .check_phys_apicid_present      = numaq_check_phys_apicid_present,
         .enable_apic_mode               = NULL,
         .phys_pkg_id                    = numaq_phys_pkg_id,
-        .mps_oem_check                  = mps_oem_check,
+        .mps_oem_check                  = __numaq_mps_oem_check,
 
         .get_apic_id                    = get_apic_id,
         .set_apic_id                    = NULL,
diff --git a/arch/x86/mach-generic/probe.c b/arch/x86/mach-generic/probe.c
index 799a70f4d90e..ab68c6e5c48a 100644
--- a/arch/x86/mach-generic/probe.c
+++ b/arch/x86/mach-generic/probe.c
@@ -110,7 +110,8 @@ void __init generic_apic_probe(void)
 
 /* These functions can switch the APIC even after the initial ->probe() */
 
-int __init mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
+int __init
+generic_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
 {
         int i;
 
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index 2d6843a61d97..719e944ff308 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -68,7 +68,7 @@ struct genapic apic_summit = {
         .check_phys_apicid_present      = summit_check_phys_apicid_present,
         .enable_apic_mode               = NULL,
         .phys_pkg_id                    = summit_phys_pkg_id,
-        .mps_oem_check                  = mps_oem_check,
+        .mps_oem_check                  = summit_mps_oem_check,
 
         .get_apic_id                    = get_apic_id,
         .set_apic_id                    = NULL,