Browse Source

x86: move mp_bus_not_pci from mpparse.c

Alexey Starikovskiy 17 năm trước cách đây
mục cha
commit
8732fc4b23
3 tập tin đã thay đổi với 8 bổ sung10 xóa
  1. 6 0
      arch/x86/kernel/io_apic_32.c
  2. 2 0
      arch/x86/kernel/io_apic_64.c
  3. 0 10
      arch/x86/kernel/mpparse.c

+ 6 - 0
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;
 
 /*

+ 2 - 0
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.

+ 0 - 10
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.
  */