diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 19:16:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 19:16:17 -0800 |
| commit | 1e4c85f97fe26fbd70da12148b3992c0e00361fd (patch) | |
| tree | cd938308f7a151bf294a2af26019c73218225c9f /arch/i386/kernel/io_apic.c | |
| parent | d83c671fb7023f69a9582e622d01525054f23b66 (diff) | |
| download | kernel_samsung_smdk4412-1e4c85f97fe26fbd70da12148b3992c0e00361fd.zip kernel_samsung_smdk4412-1e4c85f97fe26fbd70da12148b3992c0e00361fd.tar.gz kernel_samsung_smdk4412-1e4c85f97fe26fbd70da12148b3992c0e00361fd.tar.bz2 | |
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.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index 5a77c52..cc5d7ac 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) sync_Arb_IDs(); setup_IO_APIC_irqs(); init_IO_APIC_traps(); + check_timer(); if (!acpi_ioapic) print_IO_APIC(); } -void __init IO_APIC_late_time_init(void) -{ - check_timer(); -} - /* * Called after all the initialization is done. If we didnt find any * APIC bugs then we can allow the modify fast path |