aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/time.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/time.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/time.c')
-rw-r--r--arch/i386/kernel/time.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index 07471bba2dc..41c5b2dc620 100644
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
@@ -440,8 +440,8 @@ static int time_init_device(void)
440 440
441device_initcall(time_init_device); 441device_initcall(time_init_device);
442 442
443extern void (*late_time_init)(void);
444#ifdef CONFIG_HPET_TIMER 443#ifdef CONFIG_HPET_TIMER
444extern void (*late_time_init)(void);
445/* Duplicate of time_init() below, with hpet_enable part added */ 445/* Duplicate of time_init() below, with hpet_enable part added */
446static void __init hpet_time_init(void) 446static void __init hpet_time_init(void)
447{ 447{
@@ -458,11 +458,6 @@ static void __init hpet_time_init(void)
458 printk(KERN_INFO "Using %s for high-res timesource\n",cur_timer->name); 458 printk(KERN_INFO "Using %s for high-res timesource\n",cur_timer->name);
459 459
460 time_init_hook(); 460 time_init_hook();
461
462#ifdef CONFIG_X86_LOCAL_APIC
463 if (enable_local_apic >= 0)
464 APIC_late_time_init();
465#endif
466} 461}
467#endif 462#endif
468 463
@@ -487,9 +482,4 @@ void __init time_init(void)
487 printk(KERN_INFO "Using %s for high-res timesource\n",cur_timer->name); 482 printk(KERN_INFO "Using %s for high-res timesource\n",cur_timer->name);
488 483
489 time_init_hook(); 484 time_init_hook();
490
491#ifdef CONFIG_X86_LOCAL_APIC
492 if (enable_local_apic >= 0)
493 late_time_init = APIC_late_time_init;
494#endif
495} 485}