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

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

x86: remove mpc_oem_bus_info() 



Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d285e338

arch/x86/kernel/mpparse_32.c

+4 −0
Original line number Diff line number Diff line
@@ -265,7 +265,11 @@ static void __init MP_bus_info (struct mpc_config_bus *m) 
	memcpy(str, m->mpc_bustype, 6);

	str[6] = 0;



#ifdef CONFIG_X86_NUMAQ

	mpc_oem_bus_info(m, str, translation_table[mpc_record]);

#else

	Dprintk("Bus #%d is %s\n", m->mpc_busid, str);

#endif



#if MAX_MP_BUSSES < 256

	if (m->mpc_busid >= MAX_MP_BUSSES) {

arch/x86/pci/numa.c

+12 −0
Original line number Diff line number Diff line
@@ -17,6 +17,18 @@ int mp_bus_id_to_node[MAX_MP_BUSSES]; 
int mp_bus_id_to_local[MAX_MP_BUSSES];

#define BUS2LOCAL(global) (mp_bus_id_to_local[global])



void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,

	struct mpc_config_translation *translation)

{

	int quad = translation->trans_quad;

	int local = translation->trans_local;



	mp_bus_id_to_node[m->mpc_busid] = quad;

	mp_bus_id_to_local[m->mpc_busid] = local;

	printk(KERN_INFO "Bus #%d is %s (node %d)\n",

	       m->mpc_busid, name, quad);

}



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,

include/asm-x86/genapic_32.h

+0 −4
Original line number Diff line number Diff line
@@ -48,9 +48,6 @@ struct genapic { 
	u32 (*phys_pkg_id)(u32 cpuid_apic, int index_msb);



	/* mpparse */

	void (*mpc_oem_bus_info)(struct mpc_config_bus *, char *, 

				 struct mpc_config_translation *);



	/* When one of the next two hooks returns 1 the genapic

	   is switched to this. Essentially they are additional probe 

	   functions. */
@@ -103,7 +100,6 @@ struct genapic { 
	APICFUNC(apicid_to_cpu_present) \

	APICFUNC(setup_portio_remap) \

	APICFUNC(check_phys_apicid_present) \

	APICFUNC(mpc_oem_bus_info) \

	APICFUNC(mps_oem_check) \

	APICFUNC(get_apic_id) \

	.apic_id_mask = APIC_ID_MASK, \

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

+0 −6
Original line number Diff line number Diff line 
#ifndef __ASM_MACH_MPPARSE_H

#define __ASM_MACH_MPPARSE_H



static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name, 

				struct mpc_config_translation *translation)

{

//	Dprintk("Bus #%d is %s\n", m->mpc_busid, name);

}



static inline int mps_oem_check(struct mp_config_table *mpc, char *oem, 

		char *productid)

{

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

+0 −6
Original line number Diff line number Diff line
@@ -3,12 +3,6 @@ 


#include <linux/acpi.h>



static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,

				struct mpc_config_translation *translation)

{

	Dprintk("Bus #%d is %s\n", m->mpc_busid, name);

}



extern int parse_unisys_oem (char *oemptr);

extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);

extern void setup_unisys(void);