From 904af2fdd01b897fb7bc08815f37fc0b94f1fd23 Mon Sep 17 00:00:00 2001
From: Alexey Starikovskiy <astarikovskiy@suse.de>
Date: Tue, 11 Mar 2008 19:45:48 +0300
Subject: [PATCH] --- yaml --- r: 88767 b: refs/heads/master c:
 6079d2d5d11122eb52721f0f3c828952a490e6c1 h: refs/heads/master i:   88765:
 e2704970d3cfb5f201d82ed1b77ce6eea1680c92   88763:
 e381370503d735a932bb85d2704562fc5d3272a7   88759:
 91a243410768d37ec4a1783f184178c0fbbf92e4   88751:
 81c069b66fdb2fa2d460cee0f8231a219e40cbf7   88735:
 ee3c3366249cfdb8c70ab047a312c3e22755a77b   88703:
 7e673119a2ce87d1adac5548b48b8ed1616ab732 v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/x86/kernel/mpparse_32.c              | 1 -
 trunk/arch/x86/pci/numa.c                       | 2 ++
 trunk/include/asm-x86/mach-numaq/mach_mpparse.h | 2 ++
 trunk/include/asm-x86/mpspec.h                  | 1 -
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5d1c0bea3d23..d20a1be3b825 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d570cbbf25a62e9c077f5b351fb142dbfc67288
+refs/heads/master: 6079d2d5d11122eb52721f0f3c828952a490e6c1
diff --git a/trunk/arch/x86/kernel/mpparse_32.c b/trunk/arch/x86/kernel/mpparse_32.c
index b2aded3fbfec..2abc9392799a 100644
--- a/trunk/arch/x86/kernel/mpparse_32.c
+++ b/trunk/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/trunk/arch/x86/pci/numa.c b/trunk/arch/x86/pci/numa.c
index 55270c26237c..3248d3ee388f 100644
--- a/trunk/arch/x86/pci/numa.c
+++ b/trunk/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/trunk/include/asm-x86/mach-numaq/mach_mpparse.h b/trunk/include/asm-x86/mach-numaq/mach_mpparse.h
index 51bbac8fc0c2..cd21f289e6b7 100644
--- a/trunk/include/asm-x86/mach-numaq/mach_mpparse.h
+++ b/trunk/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/trunk/include/asm-x86/mpspec.h b/trunk/include/asm-x86/mpspec.h
index 781ad74ab9e9..dbd63f8d4750 100644
--- a/trunk/include/asm-x86/mpspec.h
+++ b/trunk/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];