x86: move mp_bus_id_to_node to numa.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index ae385b4278416304255fb7764b60409bbd57d52a..1b1fd6e920e6d2fb0a4291ca63aac08ba6d1554b 100644 (file)
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -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;
 

diff --git a/arch/x86/kernel/summit_32.c b/arch/x86/kernel/summit_32.c
index 30f04c3e68e448b2bcb372444829ebb605e903ce..6878a9c2df5d6dbde0a80c268238fc4a072a6dbd 100644 (file)
--- 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;
 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;

diff --git a/arch/x86/pci/numa.c b/arch/x86/pci/numa.c
index e765558f7e1b26b63c25a44a0ea6e558590584d0..9e30378364ed975f7c76baca10e5429d796c3549 100644 (file)
--- a/arch/x86/pci/numa.c
+++ b/arch/x86/pci/numa.c
@@ -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];

diff --git a/include/asm-x86/mach-numaq/mach_mpparse.h b/include/asm-x86/mach-numaq/mach_mpparse.h
index 0917b95c42ac4a98d6995b6c8998f27a328ddb90..254993ae04c7756705ac255659c7e2c40c89da8b 100644 (file)
--- a/include/asm-x86/mach-numaq/mach_mpparse.h
+++ b/include/asm-x86/mach-numaq/mach_mpparse.h
@@ -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)

diff --git a/include/asm-x86/mpspec.h b/include/asm-x86/mpspec.h
index 1c52bd8711f63787ad1673cd3dd19a81d2af36c7..99da0a59b43671d86cfdc6e9eb9160de5113e3d4 100644 (file)
--- a/include/asm-x86/mpspec.h
+++ b/include/asm-x86/mpspec.h
@@ -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[];