[PATCH] x86_64: Switch SMP bootup over to new CPU hotplug state machine

[linux-2.6.git] / arch / x86_64 / kernel / time.c

diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c
index c7a1b50b4af34b5d919a82711f3354ed67137508..943a9bfba2090d570ebbfabcc0099510ffa09679 100644 (file)
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
@@ -916,9 +916,16 @@ void __init time_init(void)
        setup_irq(0, &irq0);
 
        set_cyc2ns_scale(cpu_khz / 1000);
+
+#ifndef CONFIG_SMP
+       time_init_gtod();
+#endif
 }
 
-void __init time_init_smp(void)
+/*
+ * Decide after all CPUs are booted what mode gettimeofday should use.
+ */
+void __init time_init_gtod(void)
 {
        char *timetype;