From: Alexey Starikovskiy <astarikovskiy@suse.de>
Date: Tue, 11 Mar 2008 16:45:48 +0000 (+0300)
Subject: x86: move quad_local_to_mp_bus_id to numa.c
X-Git-Tag: v2.6.26-rc1~1154^2~415
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6079d2d5d11122eb52721f0f3c828952a490e6c1;p=linux-2.6-omap-h63xx.git

x86: move quad_local_to_mp_bus_id to numa.c

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
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 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];
 int mp_bus_id_to_type [MAX_MP_BUSSES];
 int mp_bus_id_to_node [MAX_MP_BUSSES];
 int mp_bus_id_to_local [MAX_MP_BUSSES];
-int quad_local_to_mp_bus_id [NR_CPUS/4][4];
 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/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 @@
 
 #define BUS2QUAD(global) (mp_bus_id_to_node[global])
 #define BUS2LOCAL(global) (mp_bus_id_to_local[global])
+
+int quad_local_to_mp_bus_id [NR_CPUS/4][4];
 #define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])
 
 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,
 	printk("Bus #%d is %s (node %d)\n", m->mpc_busid, name, quad);
 }
 
+extern int quad_local_to_mp_bus_id[NR_CPUS/4][4];
+
 static inline void mpc_oem_pci_bus(struct mpc_config_bus *m, 
 				struct mpc_config_translation *translation)
 {
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 @@
 extern int mp_bus_id_to_type[MAX_MP_BUSSES];
 extern int mp_bus_id_to_node[MAX_MP_BUSSES];
 extern int mp_bus_id_to_local[MAX_MP_BUSSES];
-extern int quad_local_to_mp_bus_id[NR_CPUS/4][4];
 
 extern unsigned int def_to_bigsmp;
 extern int apic_version[MAX_APICS];