x86: remove mpc_oem_pci_bus()

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 072fcc462399a7e07a8dc90bfa1437dfad12b5f5..621eac569550f1daa5c544ed8be40fd55e8223a4 100644 (file)
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -278,7 +278,9 @@ static void __init MP_bus_info (struct mpc_config_bus *m)
 
        set_bit(m->mpc_busid, mp_bus_not_pci);
        if (strncmp(str, BUSTYPE_PCI, sizeof(BUSTYPE_PCI)-1) == 0) {
+#ifdef CONFIG_X86_NUMAQ
                mpc_oem_pci_bus(m, translation_table[mpc_record]);
+#endif
                clear_bit(m->mpc_busid, mp_bus_not_pci);
                mp_bus_id_to_pci_bus[m->mpc_busid] = mp_current_pci_id;
                mp_current_pci_id++;

diff --git a/arch/x86/pci/numa.c b/arch/x86/pci/numa.c
index 79d0a98b9d03df51b7acd6413efe494f11f9bf39..a98ae0e57272c0445fd5e06a6fa5037eb73aa06b 100644 (file)
--- a/arch/x86/pci/numa.c
+++ b/arch/x86/pci/numa.c
@@ -19,6 +19,14 @@ int mp_bus_id_to_local[MAX_MP_BUSSES];
 
 int quad_local_to_mp_bus_id [NR_CPUS/4][4];
 #define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])
+void mpc_oem_pci_bus(struct mpc_config_bus *m,
+       struct mpc_config_translation *translation)
+{
+       int quad = translation->trans_quad;
+       int local = translation->trans_local;
+
+       quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
+}
 
 /* Where the IO area was mapped on multiquad, always 0 otherwise */
 void *xquad_portio;

diff --git a/include/asm-x86/genapic_32.h b/include/asm-x86/genapic_32.h
index 5d024400ddde00833ab996d0b1ce74930232a0eb..5a1ae0164aa09453c6c8d53f9ab348cc3ad85c53 100644 (file)
--- a/include/asm-x86/genapic_32.h
+++ b/include/asm-x86/genapic_32.h
@@ -50,8 +50,6 @@ struct genapic {
        /* mpparse */
        void (*mpc_oem_bus_info)(struct mpc_config_bus *, char *, 
                                 struct mpc_config_translation *);
-       void (*mpc_oem_pci_bus)(struct mpc_config_bus *, 
-                               struct mpc_config_translation *); 
 
        /* When one of the next two hooks returns 1 the genapic
           is switched to this. Essentially they are additional probe 
@@ -106,7 +104,6 @@ struct genapic {
        APICFUNC(setup_portio_remap) \
        APICFUNC(check_phys_apicid_present) \
        APICFUNC(mpc_oem_bus_info) \
-       APICFUNC(mpc_oem_pci_bus) \
        APICFUNC(mps_oem_check) \
        APICFUNC(get_apic_id) \
        .apic_id_mask = APIC_ID_MASK, \

diff --git a/include/asm-x86/mach-default/mach_mpparse.h b/include/asm-x86/mach-default/mach_mpparse.h
index 1d38324825807254a254c90158030185c2a2f570..679393c26dc660fa3a6625242b8b28e10f5a1079 100644 (file)
--- a/include/asm-x86/mach-default/mach_mpparse.h
+++ b/include/asm-x86/mach-default/mach_mpparse.h
@@ -7,11 +7,6 @@ static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
 //     Dprintk("Bus #%d is %s\n", m->mpc_busid, name);
 }
 
-static inline void mpc_oem_pci_bus(struct mpc_config_bus *m, 
-                               struct mpc_config_translation *translation)
-{
-}
-
 static inline int mps_oem_check(struct mp_config_table *mpc, char *oem, 
                char *productid)
 {

diff --git a/include/asm-x86/mach-es7000/mach_mpparse.h b/include/asm-x86/mach-es7000/mach_mpparse.h
index 52ee75cd0fe175067d5bbe35af64d3f1801296c2..3afa1b010818d3e050995d1b21a2f27286d02872 100644 (file)
--- a/include/asm-x86/mach-es7000/mach_mpparse.h
+++ b/include/asm-x86/mach-es7000/mach_mpparse.h
@@ -9,11 +9,6 @@ static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
        Dprintk("Bus #%d is %s\n", m->mpc_busid, name);
 }
 
-static inline void mpc_oem_pci_bus(struct mpc_config_bus *m,
-                               struct mpc_config_translation *translation)
-{
-}
-
 extern int parse_unisys_oem (char *oemptr);
 extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);
 extern void setup_unisys(void);

diff --git a/include/asm-x86/mach-generic/mach_mpparse.h b/include/asm-x86/mach-generic/mach_mpparse.h
index dbd9fce54f4d52be2ddf59fa667d5330fad50f05..2a693715033458c1fd9b47046ab9273d399483cd 100644 (file)
--- a/include/asm-x86/mach-generic/mach_mpparse.h
+++ b/include/asm-x86/mach-generic/mach_mpparse.h
@@ -4,7 +4,6 @@
 #include <asm/genapic.h>
 
 #define mpc_oem_bus_info (genapic->mpc_oem_bus_info)
-#define mpc_oem_pci_bus (genapic->mpc_oem_pci_bus)
 
 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); 

diff --git a/include/asm-x86/mach-numaq/mach_mpparse.h b/include/asm-x86/mach-numaq/mach_mpparse.h
index 254993ae04c7756705ac255659c7e2c40c89da8b..4a5d8a8b01a2a2e41c505e961682f9e27349a701 100644 (file)
--- a/include/asm-x86/mach-numaq/mach_mpparse.h
+++ b/include/asm-x86/mach-numaq/mach_mpparse.h
@@ -15,16 +15,8 @@ static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
        printk("Bus #%d is %s (node %d)\n", m->mpc_busid, name, quad);
 }
 
-extern int quad_local_to_mp_bus_id[NR_CPUS/4][4];
-
-static inline void mpc_oem_pci_bus(struct mpc_config_bus *m, 
-                               struct mpc_config_translation *translation)
-{
-       int quad = translation->trans_quad;
-       int local = translation->trans_local;
-
-       quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
-}
+extern void mpc_oem_pci_bus(struct mpc_config_bus *m,
+       struct mpc_config_translation *translation);
 
 /* Hook from generic ACPI tables.c */
 static inline void acpi_madt_oem_check(char *oem_id, char *oem_table_id)

diff --git a/include/asm-x86/mach-summit/mach_mpparse.h b/include/asm-x86/mach-summit/mach_mpparse.h
index c2520539d934b68db8ab624be44311231bb23697..e1af489a8809cb2aa7c8ba9a0262dd3e0a111d3b 100644 (file)
--- a/include/asm-x86/mach-summit/mach_mpparse.h
+++ b/include/asm-x86/mach-summit/mach_mpparse.h
@@ -18,11 +18,6 @@ static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
        Dprintk("Bus #%d is %s\n", m->mpc_busid, name);
 }
 
-static inline void mpc_oem_pci_bus(struct mpc_config_bus *m, 
-                               struct mpc_config_translation *translation)
-{
-}
-
 static inline int mps_oem_check(struct mp_config_table *mpc, char *oem, 
                char *productid)
 {