1 files changed, 11 insertions, 1 deletions

diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index 2883a4d4f01f..46c35ec9137d 100644
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
@@ -444,8 +444,8 @@ static int time_init_device(void)
 
 device_initcall(time_init_device);
 
-#ifdef CONFIG_HPET_TIMER
 extern void (*late_time_init)(void);
+#ifdef CONFIG_HPET_TIMER
 /* Duplicate of time_init() below, with hpet_enable part added */
 static void __init hpet_time_init(void)
 {
@@ -462,6 +462,11 @@ static void __init hpet_time_init(void)
         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
 
@@ -486,4 +491,9 @@ void __init time_init(void)
         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
 }