x86: remove mpc_apic_id()

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index a2162644cb4eee22b3d3f22ca9af4aeeb6a1d558..072fcc462399a7e07a8dc90bfa1437dfad12b5f5 100644 (file)
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -118,7 +118,16 @@ static void __cpuinit MP_processor_info (struct mpc_config_processor *m)
                return;
        }
 
+#ifdef CONFIG_X86_NUMAQ
        apicid = mpc_apic_id(m, translation_table[mpc_record]);
+#else
+       Dprintk("Processor #%d %u:%u APIC version %d\n",
+               m->mpc_apicid,
+               (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
+               (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
+               m->mpc_apicver);
+       apicid = m->mpc_apicid;
+#endif
 
        if (m->mpc_featureflag&(1<<0))
                Dprintk("    Floating point unit present.\n");

diff --git a/include/asm-x86/genapic_32.h b/include/asm-x86/genapic_32.h
index 33e3ffe1766ccc4fc493d7c0ee623c7e66dd0ef7..5d024400ddde00833ab996d0b1ce74930232a0eb 100644 (file)
--- a/include/asm-x86/genapic_32.h
+++ b/include/asm-x86/genapic_32.h
@@ -42,8 +42,6 @@ struct genapic {
        int (*cpu_to_logical_apicid)(int cpu);
        int (*cpu_present_to_apicid)(int mps_cpu);
        physid_mask_t (*apicid_to_cpu_present)(int phys_apicid);
-       int (*mpc_apic_id)(struct mpc_config_processor *m, 
-                          struct mpc_config_translation *t); 
        void (*setup_portio_remap)(void); 
        int (*check_phys_apicid_present)(int boot_cpu_physical_apicid);
        void (*enable_apic_mode)(void);
@@ -105,7 +103,6 @@ struct genapic {
        APICFUNC(cpu_to_logical_apicid) \
        APICFUNC(cpu_present_to_apicid) \
        APICFUNC(apicid_to_cpu_present) \
-       APICFUNC(mpc_apic_id) \
        APICFUNC(setup_portio_remap) \
        APICFUNC(check_phys_apicid_present) \
        APICFUNC(mpc_oem_bus_info) \

diff --git a/include/asm-x86/mach-bigsmp/mach_apic.h b/include/asm-x86/mach-bigsmp/mach_apic.h
index 0d55b1f6d56b7a54630049f13e56ad520bbe4a8a..8327907c79bf0092409f95ed14f6184a73f0434a 100644 (file)
--- a/include/asm-x86/mach-bigsmp/mach_apic.h
+++ b/include/asm-x86/mach-bigsmp/mach_apic.h
@@ -106,17 +106,6 @@ static inline int cpu_to_logical_apicid(int cpu)
        return cpu_physical_id(cpu);
 }
 
-static inline int mpc_apic_id(struct mpc_config_processor *m,
-                             struct mpc_config_translation *translation_record)
-{
-       printk("Processor #%d %u:%u APIC version %d\n",
-              m->mpc_apicid,
-              (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
-              (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
-              m->mpc_apicver);
-       return m->mpc_apicid;
-}
-
 static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_map)
 {
        /* For clustered we don't have a good way to do this yet - hack */

diff --git a/include/asm-x86/mach-default/mach_apic.h b/include/asm-x86/mach-default/mach_apic.h
index e081bdccde2bb4219018bc90e56bb86c9ab87975..13900e8cc1abf1538475ea04c8cac4b6c59efe78 100644 (file)
--- a/include/asm-x86/mach-default/mach_apic.h
+++ b/include/asm-x86/mach-default/mach_apic.h
@@ -100,17 +100,6 @@ static inline physid_mask_t apicid_to_cpu_present(int phys_apicid)
        return physid_mask_of_physid(phys_apicid);
 }
 
-static inline int mpc_apic_id(struct mpc_config_processor *m,
-                             struct mpc_config_translation *translation_record)
-{
-       printk("Processor #%d %u:%u APIC version %d\n",
-              m->mpc_apicid,
-              (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
-              (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
-              m->mpc_apicver);
-       return m->mpc_apicid;
-}
-
 static inline void setup_portio_remap(void)
 {
 }

diff --git a/include/asm-x86/mach-es7000/mach_apic.h b/include/asm-x86/mach-es7000/mach_apic.h
index 04cba9f1e37567d920949b83120f025f3fc36788..0137b6e142ccd7da1b786e12d1d544e7cca62974 100644 (file)
--- a/include/asm-x86/mach-es7000/mach_apic.h
+++ b/include/asm-x86/mach-es7000/mach_apic.h
@@ -127,16 +127,6 @@ static inline int cpu_to_logical_apicid(int cpu)
 #endif
 }
 
-static inline int mpc_apic_id(struct mpc_config_processor *m, struct mpc_config_translation *unused)
-{
-       printk("Processor #%d %u:%u APIC version %d\n",
-              m->mpc_apicid,
-              (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
-              (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
-              m->mpc_apicver);
-       return (m->mpc_apicid);
-}
-
 static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_map)
 {
        /* For clustered we don't have a good way to do this yet - hack */

diff --git a/include/asm-x86/mach-generic/mach_apic.h b/include/asm-x86/mach-generic/mach_apic.h
index a236e702152805b842c06dea1f1971b8f2062b0a..6eff343e12338f892693fa667ea25105f2ff7da9 100644 (file)
--- a/include/asm-x86/mach-generic/mach_apic.h
+++ b/include/asm-x86/mach-generic/mach_apic.h
@@ -19,7 +19,6 @@
 #define cpu_to_logical_apicid (genapic->cpu_to_logical_apicid) 
 #define cpu_present_to_apicid (genapic->cpu_present_to_apicid)
 #define apicid_to_cpu_present (genapic->apicid_to_cpu_present)
-#define mpc_apic_id (genapic->mpc_apic_id) 
 #define setup_portio_remap (genapic->setup_portio_remap)
 #define check_apicid_present (genapic->check_apicid_present)
 #define check_phys_apicid_present (genapic->check_phys_apicid_present)

diff --git a/include/asm-x86/mach-summit/mach_apic.h b/include/asm-x86/mach-summit/mach_apic.h
index 91d7641cddc92802fe73c15dfc300ff931bc998c..1f76c2e7023226656aeb48539c4985a25af339c9 100644 (file)
--- a/include/asm-x86/mach-summit/mach_apic.h
+++ b/include/asm-x86/mach-summit/mach_apic.h
@@ -125,17 +125,6 @@ static inline physid_mask_t apicid_to_cpu_present(int apicid)
        return physid_mask_of_physid(0);
 }
 
-static inline int mpc_apic_id(struct mpc_config_processor *m,
-                             struct mpc_config_translation *translation_record)
-{
-       printk("Processor #%d %u:%u APIC version %d\n",
-              m->mpc_apicid,
-              (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
-              (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
-              m->mpc_apicver);
-       return m->mpc_apicid;
-}
-
 static inline void setup_portio_remap(void)
 {
 }