diff options
author | Alexey Starikovskiy <astarikovskiy@suse.de> | 2008-04-04 15:41:38 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:35 -0400 |
commit | 350bae1d3f0d0c763c5bb9cc5fb5c363bd0086db (patch) | |
tree | 76dea12022cb93541856294f54f1be7b245e76a2 | |
parent | 584f734d035db5c5c07f938e464ddeeefde7ec31 (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.c | 6 | ||||
-rw-r--r-- | arch/x86/kernel/mpparse_64.c | 6 |
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 e9217edab434..65b6840e1820 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]; | |||
107 | struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS]; | 107 | struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS]; |
108 | int nr_ioapics; | 108 | int nr_ioapics; |
109 | 109 | ||
110 | /* MP IRQ source entries */ | ||
111 | struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; | ||
112 | |||
113 | /* # of MP IRQ source entries */ | ||
114 | int mp_irq_entries; | ||
115 | |||
110 | /* | 116 | /* |
111 | * Rough estimation of how many shared IRQs there are, can | 117 | * Rough estimation of how many shared IRQs there are, can |
112 | * be changed anytime. | 118 | * be changed anytime. |
diff --git a/arch/x86/kernel/mpparse_64.c b/arch/x86/kernel/mpparse_64.c index 813057cb2ddb..07c98dbd468a 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 }; | |||
45 | 45 | ||
46 | static int mp_current_pci_id = 0; | 46 | static int mp_current_pci_id = 0; |
47 | 47 | ||
48 | /* # of MP IRQ source entries */ | ||
49 | struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; | ||
50 | |||
51 | /* MP IRQ source entries */ | ||
52 | int mp_irq_entries; | ||
53 | |||
54 | /* Make it easy to share the UP and SMP code: */ | 48 | /* Make it easy to share the UP and SMP code: */ |
55 | #ifndef CONFIG_X86_SMP | 49 | #ifndef CONFIG_X86_SMP |
56 | unsigned int num_processors; | 50 | unsigned int num_processors; |