aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-04-04 23:41:38 +0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:41:35 +0200
commit350bae1d3f0d0c763c5bb9cc5fb5c363bd0086db (patch)
tree76dea12022cb93541856294f54f1be7b245e76a2
parent584f734d035db5c5c07f938e464ddeeefde7ec31 (diff)
x86: move mp_irqs to io_apic_64.c
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/io_apic_64.c6
-rw-r--r--arch/x86/kernel/mpparse_64.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c
index e9217edab43..65b6840e182 100644
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@ -107,6 +107,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;
+
/*
* Rough estimation of how many shared IRQs there are, can
* be changed anytime.
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c
index 813057cb2dd..07c98dbd468 100644
--- a/arch/x86/kernel/mpparse_64.c
+++ b/arch/x86/kernel/mpparse_64.c
@@ -45,12 +45,6 @@ int mp_bus_id_to_pci_bus[MAX_MP_BUSSES] = {[0 ... MAX_MP_BUSSES - 1] = -1 };
static int mp_current_pci_id = 0;
-/* # of MP IRQ source entries */
-struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES];
-
-/* MP IRQ source entries */
-int mp_irq_entries;
-
/* Make it easy to share the UP and SMP code: */
#ifndef CONFIG_X86_SMP
unsigned int num_processors;