aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-03-11 15:55:48 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:40:59 -0400
commit037cab07e9515149fecc2274775807f06ea6b036 (patch)
treece551b4846fa55f8e60cd62d3c0004e856e838dd /arch/x86/kernel
parente129cb490e842753b43af7aae136935fc0928dc8 (diff)
x86: move mp_bus_id_to_node to numa.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/mpparse_32.c1
-rw-r--r--arch/x86/kernel/summit_32.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 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];
46int mp_bus_id_to_type [MAX_MP_BUSSES]; 46int 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];
50int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 }; 49int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 };
51static int mp_current_pci_id; 50static 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;
35static struct scal_detail *scal_devs[MAX_NUMNODES] __initdata; 35static struct scal_detail *scal_devs[MAX_NUMNODES] __initdata;
36static struct rio_detail *rio_devs[MAX_NUMNODES*4] __initdata; 36static struct rio_detail *rio_devs[MAX_NUMNODES*4] __initdata;
37 37
38static int mp_bus_id_to_node[MAX_MP_BUSSES] __initdata;
39
38static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus) 40static 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;