aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-03-11 15:55:42 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:40:59 -0400
commite129cb490e842753b43af7aae136935fc0928dc8 (patch)
treeaa5c03fe44d3e05481842ca71c80090746b40ef5 /arch
parentc0a282c251181aa423d4831719613b8286b5b839 (diff)
x86: move mp_bus_id_to_local to numa.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/mpparse_32.c1
-rw-r--r--arch/x86/pci/numa.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index 8795122db9bc..ae385b427841 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -47,7 +47,6 @@ int mp_bus_id_to_type [MAX_MP_BUSSES];
47#endif 47#endif
48DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES); 48DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);
49int mp_bus_id_to_node [MAX_MP_BUSSES]; 49int mp_bus_id_to_node [MAX_MP_BUSSES];
50int mp_bus_id_to_local [MAX_MP_BUSSES];
51int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 }; 50int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 };
52static int mp_current_pci_id; 51static int mp_current_pci_id;
53 52
diff --git a/arch/x86/pci/numa.c b/arch/x86/pci/numa.c
index 3248d3ee388f..e765558f7e1b 100644
--- a/arch/x86/pci/numa.c
+++ b/arch/x86/pci/numa.c
@@ -12,6 +12,8 @@
12#define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */ 12#define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */
13 13
14#define BUS2QUAD(global) (mp_bus_id_to_node[global]) 14#define BUS2QUAD(global) (mp_bus_id_to_node[global])
15
16int mp_bus_id_to_local[MAX_MP_BUSSES];
15#define BUS2LOCAL(global) (mp_bus_id_to_local[global]) 17#define BUS2LOCAL(global) (mp_bus_id_to_local[global])
16 18
17int quad_local_to_mp_bus_id [NR_CPUS/4][4]; 19int quad_local_to_mp_bus_id [NR_CPUS/4][4];