aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/io_apic.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-31 22:16:17 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-31 22:16:17 -0500
commit1e4c85f97fe26fbd70da12148b3992c0e00361fd (patch)
treecd938308f7a151bf294a2af26019c73218225c9f /arch/i386/kernel/io_apic.c
parentd83c671fb7023f69a9582e622d01525054f23b66 (diff)
Revert "i386: move apic init in init_IRQs"
Commit f2b36db692b7ff6972320ad9839ae656a3b0ee3e causes a bootup hang on at least one machine. Revert for now until we understand why. The old code may be ugly, but it works. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/kernel/io_apic.c')
-rw-r--r--arch/i386/kernel/io_apic.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 5a77c52b20a9..cc5d7ac5b2e7 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -2387,15 +2387,11 @@ void __init setup_IO_APIC(void)
2387 sync_Arb_IDs(); 2387 sync_Arb_IDs();
2388 setup_IO_APIC_irqs(); 2388 setup_IO_APIC_irqs();
2389 init_IO_APIC_traps(); 2389 init_IO_APIC_traps();
2390 check_timer();
2390 if (!acpi_ioapic) 2391 if (!acpi_ioapic)
2391 print_IO_APIC(); 2392 print_IO_APIC();
2392} 2393}
2393 2394
2394void __init IO_APIC_late_time_init(void)
2395{
2396 check_timer();
2397}
2398
2399/* 2395/*
2400 * Called after all the initialization is done. If we didnt find any 2396 * Called after all the initialization is done. If we didnt find any
2401 * APIC bugs then we can allow the modify fast path 2397 * APIC bugs then we can allow the modify fast path