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>
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index 07471bb..41c5b2d 100644
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
@@ -440,8 +440,8 @@
device_initcall(time_init_device);
-extern void (*late_time_init)(void);
#ifdef CONFIG_HPET_TIMER
+extern void (*late_time_init)(void);
/* Duplicate of time_init() below, with hpet_enable part added */
static void __init hpet_time_init(void)
{
@@ -458,11 +458,6 @@
printk(KERN_INFO "Using %s for high-res timesource\n",cur_timer->name);
time_init_hook();
-
-#ifdef CONFIG_X86_LOCAL_APIC
- if (enable_local_apic >= 0)
- APIC_late_time_init();
-#endif
}
#endif
@@ -487,9 +482,4 @@
printk(KERN_INFO "Using %s for high-res timesource\n",cur_timer->name);
time_init_hook();
-
-#ifdef CONFIG_X86_LOCAL_APIC
- if (enable_local_apic >= 0)
- late_time_init = APIC_late_time_init;
-#endif
}