aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/acpi
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-08-19 23:50:52 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-16 10:52:58 -0400
commit9d6a4d0823b3b8e29156f5e698b5a68687afad32 (patch)
treeb3a06b8392f8b451625ad64ad7d51b60456fb388 /arch/x86/kernel/acpi
parent8f09cd20a24c5f13c571bc73ddcd47be0af3b70f (diff)
x86: probe nr_irqs even only mptable is used
for !CONFIG_HAVE_SPARSE_IRQ fix: In file included from arch/x86/kernel/early-quirks.c:18: include/asm/io_apic.h: In function 'probe_nr_irqs': include/asm/io_apic.h:209: error: 'NR_IRQS' undeclared (first use in this function) include/asm/io_apic.h:209: error: (Each undeclared identifier is reported only once include/asm/io_apic.h:209: error: for each function it appears in.) v2: fix by Ingo Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/acpi')
-rw-r--r--arch/x86/kernel/acpi/boot.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 3e9d163fd92f..5fef4fece4a5 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -957,29 +957,6 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
957 nr_ioapics++; 957 nr_ioapics++;
958} 958}
959 959
960int get_nr_irqs_via_madt(void)
961{
962 int idx;
963 int nr = 0;
964
965 for (idx = 0; idx < nr_ioapics; idx++) {
966 if (mp_ioapic_routing[idx].gsi_end > nr)
967 nr = mp_ioapic_routing[idx].gsi_end;
968 }
969
970 nr++;
971
972 /* double it for hotplug and msi and nmi */
973 nr <<= 1;
974
975 /* something wrong ? */
976 if (nr < 32)
977 nr = 32;
978
979 return nr;
980
981}
982
983static void assign_to_mp_irq(struct mp_config_intsrc *m, 960static void assign_to_mp_irq(struct mp_config_intsrc *m,
984 struct mp_config_intsrc *mp_irq) 961 struct mp_config_intsrc *mp_irq)
985{ 962{
@@ -1278,8 +1255,6 @@ static int __init acpi_parse_madt_ioapic_entries(void)
1278 } 1255 }
1279 1256
1280 1257
1281 nr_irqs = get_nr_irqs_via_madt();
1282
1283 count = 1258 count =
1284 acpi_table_parse_madt(ACPI_MADT_TYPE_INTERRUPT_OVERRIDE, acpi_parse_int_src_ovr, 1259 acpi_table_parse_madt(ACPI_MADT_TYPE_INTERRUPT_OVERRIDE, acpi_parse_int_src_ovr,
1285 nr_irqs); 1260 nr_irqs);