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

x86: move quad_local_to_mp_bus_id to numa.c 



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

arch/x86/kernel/mpparse_32.c

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ int apic_version [MAX_APICS]; 
int mp_bus_id_to_type [MAX_MP_BUSSES];

int mp_bus_id_to_node [MAX_MP_BUSSES];

int mp_bus_id_to_local [MAX_MP_BUSSES];

int quad_local_to_mp_bus_id [NR_CPUS/4][4];

int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 };

static int mp_current_pci_id;

arch/x86/pci/numa.c

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 


#define BUS2QUAD(global) (mp_bus_id_to_node[global])

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



int quad_local_to_mp_bus_id [NR_CPUS/4][4];

#define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])



extern void *xquad_portio;    /* Where the IO area was mapped */

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

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,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)

{

include/asm-x86/mpspec.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
extern int mp_bus_id_to_type[MAX_MP_BUSSES];

extern int mp_bus_id_to_node[MAX_MP_BUSSES];

extern int mp_bus_id_to_local[MAX_MP_BUSSES];

extern int quad_local_to_mp_bus_id[NR_CPUS/4][4];



extern unsigned int def_to_bigsmp;

extern int apic_version[MAX_APICS];