diff options
author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-03-11 15:55:48 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:40:59 -0400 |
commit | 037cab07e9515149fecc2274775807f06ea6b036 (patch) | |
tree | ce551b4846fa55f8e60cd62d3c0004e856e838dd | |
parent | e129cb490e842753b43af7aae136935fc0928dc8 (diff) |
x86: move mp_bus_id_to_node to numa.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86/kernel/mpparse_32.c | 1 | ||||
-rw-r--r-- | arch/x86/kernel/summit_32.c | 2 | ||||
-rw-r--r-- | arch/x86/pci/numa.c | 1 | ||||
-rw-r--r-- | include/asm-x86/mach-numaq/mach_mpparse.h | 1 | ||||
-rw-r--r-- | include/asm-x86/mpspec.h | 2 |
5 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c index ae385b427841..1b1fd6e920e6 100644 --- a/arch/x86/kernel/mpparse_32.c +++ b/arch/x86/kernel/mpparse_32.c | |||
@@ -46,7 +46,6 @@ int apic_version [MAX_APICS]; | |||
46 | int mp_bus_id_to_type [MAX_MP_BUSSES]; | 46 | int mp_bus_id_to_type [MAX_MP_BUSSES]; |
47 | #endif | 47 | #endif |
48 | DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES); | 48 | DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES); |
49 | int mp_bus_id_to_node [MAX_MP_BUSSES]; | ||
50 | int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 }; | 49 | int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 }; |
51 | static int mp_current_pci_id; | 50 | static int mp_current_pci_id; |
52 | 51 | ||
diff --git a/arch/x86/kernel/summit_32.c b/arch/x86/kernel/summit_32.c index 30f04c3e68e4..6878a9c2df5d 100644 --- a/arch/x86/kernel/summit_32.c +++ b/arch/x86/kernel/summit_32.c | |||
@@ -35,6 +35,8 @@ static struct rio_table_hdr *rio_table_hdr __initdata; | |||
35 | static struct scal_detail *scal_devs[MAX_NUMNODES] __initdata; | 35 | static struct scal_detail *scal_devs[MAX_NUMNODES] __initdata; |
36 | static struct rio_detail *rio_devs[MAX_NUMNODES*4] __initdata; | 36 | static struct rio_detail *rio_devs[MAX_NUMNODES*4] __initdata; |
37 | 37 | ||
38 | static int mp_bus_id_to_node[MAX_MP_BUSSES] __initdata; | ||
39 | |||
38 | static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus) | 40 | static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus) |
39 | { | 41 | { |
40 | int twister = 0, node = 0; | 42 | int twister = 0, node = 0; |
diff --git a/arch/x86/pci/numa.c b/arch/x86/pci/numa.c index e765558f7e1b..9e30378364ed 100644 --- a/arch/x86/pci/numa.c +++ b/arch/x86/pci/numa.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #define XQUAD_PORTIO_BASE 0xfe400000 | 11 | #define XQUAD_PORTIO_BASE 0xfe400000 |
12 | #define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */ | 12 | #define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */ |
13 | 13 | ||
14 | int mp_bus_id_to_node[MAX_MP_BUSSES]; | ||
14 | #define BUS2QUAD(global) (mp_bus_id_to_node[global]) | 15 | #define BUS2QUAD(global) (mp_bus_id_to_node[global]) |
15 | 16 | ||
16 | int mp_bus_id_to_local[MAX_MP_BUSSES]; | 17 | int mp_bus_id_to_local[MAX_MP_BUSSES]; |
diff --git a/include/asm-x86/mach-numaq/mach_mpparse.h b/include/asm-x86/mach-numaq/mach_mpparse.h index 0917b95c42ac..254993ae04c7 100644 --- a/include/asm-x86/mach-numaq/mach_mpparse.h +++ b/include/asm-x86/mach-numaq/mach_mpparse.h | |||
@@ -2,6 +2,7 @@ | |||
2 | #define __ASM_MACH_MPPARSE_H | 2 | #define __ASM_MACH_MPPARSE_H |
3 | 3 | ||
4 | extern int mp_bus_id_to_local[MAX_MP_BUSSES]; | 4 | extern int mp_bus_id_to_local[MAX_MP_BUSSES]; |
5 | extern int mp_bus_id_to_node[MAX_MP_BUSSES]; | ||
5 | 6 | ||
6 | static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name, | 7 | static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name, |
7 | struct mpc_config_translation *translation) | 8 | struct mpc_config_translation *translation) |
diff --git a/include/asm-x86/mpspec.h b/include/asm-x86/mpspec.h index 1c52bd8711f6..99da0a59b436 100644 --- a/include/asm-x86/mpspec.h +++ b/include/asm-x86/mpspec.h | |||
@@ -6,8 +6,6 @@ | |||
6 | #ifdef CONFIG_X86_32 | 6 | #ifdef CONFIG_X86_32 |
7 | #include <mach_mpspec.h> | 7 | #include <mach_mpspec.h> |
8 | 8 | ||
9 | extern int mp_bus_id_to_node[MAX_MP_BUSSES]; | ||
10 | |||
11 | extern unsigned int def_to_bigsmp; | 9 | extern unsigned int def_to_bigsmp; |
12 | extern int apic_version[MAX_APICS]; | 10 | extern int apic_version[MAX_APICS]; |
13 | extern u8 apicid_2_node[]; | 11 | extern u8 apicid_2_node[]; |