Commit d285e338 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Ingo Molnar

x86: remove mpc_oem_pci_bus()

Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 4655c7de
...@@ -278,7 +278,9 @@ static void __init MP_bus_info (struct mpc_config_bus *m) ...@@ -278,7 +278,9 @@ static void __init MP_bus_info (struct mpc_config_bus *m)
set_bit(m->mpc_busid, mp_bus_not_pci); set_bit(m->mpc_busid, mp_bus_not_pci);
if (strncmp(str, BUSTYPE_PCI, sizeof(BUSTYPE_PCI)-1) == 0) { if (strncmp(str, BUSTYPE_PCI, sizeof(BUSTYPE_PCI)-1) == 0) {
#ifdef CONFIG_X86_NUMAQ
mpc_oem_pci_bus(m, translation_table[mpc_record]); mpc_oem_pci_bus(m, translation_table[mpc_record]);
#endif
clear_bit(m->mpc_busid, mp_bus_not_pci); clear_bit(m->mpc_busid, mp_bus_not_pci);
mp_bus_id_to_pci_bus[m->mpc_busid] = mp_current_pci_id; mp_bus_id_to_pci_bus[m->mpc_busid] = mp_current_pci_id;
mp_current_pci_id++; mp_current_pci_id++;
......
...@@ -19,6 +19,14 @@ int mp_bus_id_to_local[MAX_MP_BUSSES]; ...@@ -19,6 +19,14 @@ int mp_bus_id_to_local[MAX_MP_BUSSES];
int quad_local_to_mp_bus_id [NR_CPUS/4][4]; int quad_local_to_mp_bus_id [NR_CPUS/4][4];
#define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local]) #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 */ /* Where the IO area was mapped on multiquad, always 0 otherwise */
void *xquad_portio; void *xquad_portio;
......
...@@ -50,8 +50,6 @@ struct genapic { ...@@ -50,8 +50,6 @@ struct genapic {
/* mpparse */ /* mpparse */
void (*mpc_oem_bus_info)(struct mpc_config_bus *, char *, void (*mpc_oem_bus_info)(struct mpc_config_bus *, char *,
struct mpc_config_translation *); 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 /* When one of the next two hooks returns 1 the genapic
is switched to this. Essentially they are additional probe is switched to this. Essentially they are additional probe
...@@ -106,7 +104,6 @@ struct genapic { ...@@ -106,7 +104,6 @@ struct genapic {
APICFUNC(setup_portio_remap) \ APICFUNC(setup_portio_remap) \
APICFUNC(check_phys_apicid_present) \ APICFUNC(check_phys_apicid_present) \
APICFUNC(mpc_oem_bus_info) \ APICFUNC(mpc_oem_bus_info) \
APICFUNC(mpc_oem_pci_bus) \
APICFUNC(mps_oem_check) \ APICFUNC(mps_oem_check) \
APICFUNC(get_apic_id) \ APICFUNC(get_apic_id) \
.apic_id_mask = APIC_ID_MASK, \ .apic_id_mask = APIC_ID_MASK, \
......
...@@ -7,11 +7,6 @@ static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name, ...@@ -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); // 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, static inline int mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid) char *productid)
{ {
......
...@@ -9,11 +9,6 @@ static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name, ...@@ -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); 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 parse_unisys_oem (char *oemptr);
extern int find_unisys_acpi_oem_table(unsigned long *oem_addr); extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);
extern void setup_unisys(void); extern void setup_unisys(void);
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include <asm/genapic.h> #include <asm/genapic.h>
#define mpc_oem_bus_info (genapic->mpc_oem_bus_info) #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 mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid);
int acpi_madt_oem_check(char *oem_id, char *oem_table_id); int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
......
...@@ -15,16 +15,8 @@ static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name, ...@@ -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); 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]; extern void mpc_oem_pci_bus(struct mpc_config_bus *m,
struct mpc_config_translation *translation);
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;
}
/* Hook from generic ACPI tables.c */ /* Hook from generic ACPI tables.c */
static inline void acpi_madt_oem_check(char *oem_id, char *oem_table_id) static inline void acpi_madt_oem_check(char *oem_id, char *oem_table_id)
......
...@@ -18,11 +18,6 @@ static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name, ...@@ -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); 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, static inline int mps_oem_check(struct mp_config_table *mpc, char *oem,
char *productid) char *productid)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment