Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/x86/kernel/mpparse_32.c

+2 −0
Original line number Diff line number Diff line
@@ -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++;

arch/x86/pci/numa.c

+8 −0
Original line number Diff line number Diff line
@@ -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;

include/asm-x86/genapic_32.h

+0 −3
Original line number Diff line number Diff line
@@ -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, \

include/asm-x86/mach-default/mach_mpparse.h

+0 −5
Original line number Diff line number Diff line
@@ -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)

{

include/asm-x86/mach-es7000/mach_mpparse.h

+0 −5
Original line number Diff line number Diff line
@@ -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);