diff options
-rw-r--r-- | arch/x86/kernel/mpparse_32.c | 1 | ||||
-rw-r--r-- | arch/x86/pci/numa.c | 2 | ||||
-rw-r--r-- | include/asm-x86/mach-numaq/mach_mpparse.h | 2 | ||||
-rw-r--r-- | include/asm-x86/mpspec.h | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c index b2aded3fbfe..2abc9392799 100644 --- a/arch/x86/kernel/mpparse_32.c +++ b/arch/x86/kernel/mpparse_32.c | |||
@@ -45,7 +45,6 @@ int apic_version [MAX_APICS]; | |||
45 | int mp_bus_id_to_type [MAX_MP_BUSSES]; | 45 | int mp_bus_id_to_type [MAX_MP_BUSSES]; |
46 | int mp_bus_id_to_node [MAX_MP_BUSSES]; | 46 | int mp_bus_id_to_node [MAX_MP_BUSSES]; |
47 | int mp_bus_id_to_local [MAX_MP_BUSSES]; | 47 | int mp_bus_id_to_local [MAX_MP_BUSSES]; |
48 | int quad_local_to_mp_bus_id [NR_CPUS/4][4]; | ||
49 | int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 }; | 48 | int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 }; |
50 | static int mp_current_pci_id; | 49 | static int mp_current_pci_id; |
51 | 50 | ||
diff --git a/arch/x86/pci/numa.c b/arch/x86/pci/numa.c index 55270c26237..3248d3ee388 100644 --- a/arch/x86/pci/numa.c +++ b/arch/x86/pci/numa.c | |||
@@ -13,6 +13,8 @@ | |||
13 | 13 | ||
14 | #define BUS2QUAD(global) (mp_bus_id_to_node[global]) | 14 | #define BUS2QUAD(global) (mp_bus_id_to_node[global]) |
15 | #define BUS2LOCAL(global) (mp_bus_id_to_local[global]) | 15 | #define BUS2LOCAL(global) (mp_bus_id_to_local[global]) |
16 | |||
17 | int quad_local_to_mp_bus_id [NR_CPUS/4][4]; | ||
16 | #define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local]) | 18 | #define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local]) |
17 | 19 | ||
18 | extern void *xquad_portio; /* Where the IO area was mapped */ | 20 | extern void *xquad_portio; /* Where the IO area was mapped */ |
diff --git a/include/asm-x86/mach-numaq/mach_mpparse.h b/include/asm-x86/mach-numaq/mach_mpparse.h index 51bbac8fc0c..cd21f289e6b 100644 --- a/include/asm-x86/mach-numaq/mach_mpparse.h +++ b/include/asm-x86/mach-numaq/mach_mpparse.h | |||
@@ -12,6 +12,8 @@ static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name, | |||
12 | printk("Bus #%d is %s (node %d)\n", m->mpc_busid, name, quad); | 12 | printk("Bus #%d is %s (node %d)\n", m->mpc_busid, name, quad); |
13 | } | 13 | } |
14 | 14 | ||
15 | extern int quad_local_to_mp_bus_id[NR_CPUS/4][4]; | ||
16 | |||
15 | static inline void mpc_oem_pci_bus(struct mpc_config_bus *m, | 17 | static inline void mpc_oem_pci_bus(struct mpc_config_bus *m, |
16 | struct mpc_config_translation *translation) | 18 | struct mpc_config_translation *translation) |
17 | { | 19 | { |
diff --git a/include/asm-x86/mpspec.h b/include/asm-x86/mpspec.h index 781ad74ab9e..dbd63f8d475 100644 --- a/include/asm-x86/mpspec.h +++ b/include/asm-x86/mpspec.h | |||
@@ -9,7 +9,6 @@ | |||
9 | extern int mp_bus_id_to_type[MAX_MP_BUSSES]; | 9 | extern int mp_bus_id_to_type[MAX_MP_BUSSES]; |
10 | extern int mp_bus_id_to_node[MAX_MP_BUSSES]; | 10 | extern int mp_bus_id_to_node[MAX_MP_BUSSES]; |
11 | extern int mp_bus_id_to_local[MAX_MP_BUSSES]; | 11 | extern int mp_bus_id_to_local[MAX_MP_BUSSES]; |
12 | extern int quad_local_to_mp_bus_id[NR_CPUS/4][4]; | ||
13 | 12 | ||
14 | extern unsigned int def_to_bigsmp; | 13 | extern unsigned int def_to_bigsmp; |
15 | extern int apic_version[MAX_APICS]; | 14 | extern int apic_version[MAX_APICS]; |