Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

--- 2010-06-15.orig/xen/arch/x86/mpparse.c	2010-05-20 09:59:27.000000000 +0200
+++ 2010-06-15/xen/arch/x86/mpparse.c	2010-07-06 14:50:36.000000000 +0200
@@ -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;
 
--- 2010-06-15.orig/xen/include/asm-x86/mpspec.h	2009-11-12 17:04:47.000000000 +0100
+++ 2010-06-15/xen/include/asm-x86/mpspec.h	2010-07-06 14:50:48.000000000 +0200
@@ -8,7 +8,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 int mp_bus_id_to_pci_bus [MAX_MP_BUSSES];
 
 extern unsigned int def_to_bigsmp;