summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-04-04 23:41:32 +0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:41:35 +0200
commit584f734d035db5c5c07f938e464ddeeefde7ec31 (patch)
treea0dc1f44efb0f60b9e88b3e44c1ddf6e6a57d980 /arch/x86
parent9e5c5f1dd29c86307e6b3cfa75e85d0efccc1f6b (diff)
x86: move mp_irqs to io_apics_32.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/io_apic_32.c6
-rw-r--r--arch/x86/kernel/mpparse_32.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c
index 2e01b69a46e0..db1b1f30b650 100644
--- a/arch/x86/kernel/io_apic_32.c
+++ b/arch/x86/kernel/io_apic_32.c
@@ -75,6 +75,12 @@ int nr_ioapic_registers[MAX_IO_APICS];
struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS];
int nr_ioapics;
+/* MP IRQ source entries */
+struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES];
+
+/* # of MP IRQ source entries */
+int mp_irq_entries;
+
static int disable_timer_pin_1 __initdata;
/*
diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index b6f1e4e235e3..2b16e5c71a64 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -47,12 +47,6 @@ 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;
-/* # of MP IRQ source entries */
-struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES];
-
-/* MP IRQ source entries */
-int mp_irq_entries;
-
int pic_mode;
/* Make it easy to share the UP and SMP code: */