From 39aa7411c85baaf3bd54aa8b6669e90f7f0590d6 Mon Sep 17 00:00:00 2001
From: Alexey Starikovskiy <astarikovskiy@suse.de>
Date: Mon, 19 May 2008 19:47:16 +0400
Subject: [PATCH] --- yaml --- r: 99710 b: refs/heads/master c:
 8732fc4b237fca3bd3cb0ec87ca8fb90271b0baf h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/arch/x86/kernel/io_apic_32.c |  6 ++++++
 trunk/arch/x86/kernel/io_apic_64.c |  2 ++
 trunk/arch/x86/kernel/mpparse.c    | 10 ----------
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index af75cb0260b8..62238b31f97a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce6444d39fdea29dcf145d2d95fe9cdc850aa53c
+refs/heads/master: 8732fc4b237fca3bd3cb0ec87ca8fb90271b0baf
diff --git a/trunk/arch/x86/kernel/io_apic_32.c b/trunk/arch/x86/kernel/io_apic_32.c
index 17b2e8f862d3..2285b81ad1d5 100644
--- a/trunk/arch/x86/kernel/io_apic_32.c
+++ b/trunk/arch/x86/kernel/io_apic_32.c
@@ -81,6 +81,12 @@ struct mp_config_intsrc mp_irqs[MAX_IRQ_SOURCES];
 /* # of MP IRQ source entries */
 int mp_irq_entries;
 
+#if defined (CONFIG_MCA) || defined (CONFIG_EISA)
+int mp_bus_id_to_type[MAX_MP_BUSSES];
+#endif
+
+DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);
+
 static int disable_timer_pin_1 __initdata;
 
 /*
diff --git a/trunk/arch/x86/kernel/io_apic_64.c b/trunk/arch/x86/kernel/io_apic_64.c
index 9637675ea555..339cf6f926dc 100644
--- a/trunk/arch/x86/kernel/io_apic_64.c
+++ b/trunk/arch/x86/kernel/io_apic_64.c
@@ -113,6 +113,8 @@ struct mp_config_intsrc mp_irqs[MAX_IRQ_SOURCES];
 /* # of MP IRQ source entries */
 int mp_irq_entries;
 
+DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);
+
 /*
  * Rough estimation of how many shared IRQs there are, can
  * be changed anytime.
diff --git a/trunk/arch/x86/kernel/mpparse.c b/trunk/arch/x86/kernel/mpparse.c
index 83dfd6696c2a..e8e041ed84d6 100644
--- a/trunk/arch/x86/kernel/mpparse.c
+++ b/trunk/arch/x86/kernel/mpparse.c
@@ -32,16 +32,6 @@
 #include <mach_mpparse.h>
 #endif
 
-/*
- * Various Linux-internal data structures created from the
- * MP-table.
- */
-#if defined (CONFIG_MCA) || defined (CONFIG_EISA)
-int mp_bus_id_to_type[MAX_MP_BUSSES];
-#endif
-
-DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);
-
 /*
  * Checksum an MP configuration block.
  */