Bladeren bron

x86: move mp_ioapics to io_apic_32.c

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Alexey Starikovskiy 17 jaren geleden
bovenliggende
commit
9f640ccbc6
2 gewijzigde bestanden met toevoegingen van 4 en 5 verwijderingen
  1. 4 0
      arch/x86/kernel/io_apic_32.c
  2. 0 5
      arch/x86/kernel/mpparse_32.c

+ 4 - 0
arch/x86/kernel/io_apic_32.c

@@ -71,6 +71,10 @@ int sis_apic_bug = -1;
  */
 int nr_ioapic_registers[MAX_IO_APICS];
 
+/* I/O APIC entries */
+struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS];
+int nr_ioapics;
+
 static int disable_timer_pin_1 __initdata;
 
 /*

+ 0 - 5
arch/x86/kernel/mpparse_32.c

@@ -47,17 +47,12 @@ DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);
 int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 };
 static int mp_current_pci_id;
 
-/* I/O APIC entries */
-struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS];
-
 /* # of MP IRQ source entries */
 struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES];
 
 /* MP IRQ source entries */
 int mp_irq_entries;
 
-int nr_ioapics;
-
 int pic_mode;
 
 /* Make it easy to share the UP and SMP code: */