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

x86: move mp_bus_id_to_local to numa.c 



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

arch/x86/kernel/mpparse_32.c

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ int mp_bus_id_to_type [MAX_MP_BUSSES]; 
#endif

DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);

int mp_bus_id_to_node [MAX_MP_BUSSES];

int mp_bus_id_to_local [MAX_MP_BUSSES];

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
@@ -12,6 +12,8 @@ 
#define XQUAD_PORTIO_QUAD 0x40000  /* 256k per quad. */



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



int mp_bus_id_to_local[MAX_MP_BUSSES];

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



int quad_local_to_mp_bus_id [NR_CPUS/4][4];

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

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

#define __ASM_MACH_MPPARSE_H



extern int mp_bus_id_to_local[MAX_MP_BUSSES];



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

				struct mpc_config_translation *translation)

{

include/asm-x86/mpspec.h

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <mach_mpspec.h>



extern int mp_bus_id_to_node[MAX_MP_BUSSES];

extern int mp_bus_id_to_local[MAX_MP_BUSSES];



extern unsigned int def_to_bigsmp;

extern int apic_version[MAX_APICS];