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

x86: move mp_bus_id_to_node to numa.c 



Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e129cb49

arch/x86/kernel/mpparse_32.c

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ int apic_version [MAX_APICS]; 
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_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 };

static int mp_current_pci_id;

arch/x86/kernel/summit_32.c

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ static struct rio_table_hdr *rio_table_hdr __initdata; 
static struct scal_detail   *scal_devs[MAX_NUMNODES] __initdata;

static struct rio_detail    *rio_devs[MAX_NUMNODES*4] __initdata;



static int mp_bus_id_to_node[MAX_MP_BUSSES] __initdata;



static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus)

{

	int twister = 0, node = 0;

arch/x86/pci/numa.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#define XQUAD_PORTIO_BASE 0xfe400000

#define XQUAD_PORTIO_QUAD 0x40000  /* 256k per quad. */



int mp_bus_id_to_node[MAX_MP_BUSSES];

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



int mp_bus_id_to_local[MAX_MP_BUSSES];

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

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define __ASM_MACH_MPPARSE_H



extern int mp_bus_id_to_local[MAX_MP_BUSSES];

extern int mp_bus_id_to_node[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 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ 
#ifdef CONFIG_X86_32

#include <mach_mpspec.h>



extern int mp_bus_id_to_node[MAX_MP_BUSSES];



extern unsigned int def_to_bigsmp;

extern int apic_version[MAX_APICS];

extern u8 apicid_2_node[];