Don't 'printk()' while holding xtime lock for writing

[sfrench/cifs-2.6.git] / kernel / time / timekeeping.c

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 1af9fb050fe28b1e77ae9f43c3005e16972b2d65..a3fa587c350c598063a17c903beeee99fe0f47e0 100644 (file)
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -187,13 +187,16 @@ static void change_clocksource(void)
 
        clock->error = 0;
        clock->xtime_nsec = 0;
-       clocksource_calculate_interval(clock,
-               (unsigned long)(current_tick_length()>>TICK_LENGTH_SHIFT));
+       clocksource_calculate_interval(clock, NTP_INTERVAL_LENGTH);
 
        tick_clock_notify();
 
+       /*
+        * We're holding xtime lock and waking up klogd would deadlock
+        * us on enqueue.  So no printing!
        printk(KERN_INFO "Time: %s clocksource has been installed.\n",
               clock->name);
+        */
 }
 #else
 static inline void change_clocksource(void) { }
@@ -245,8 +248,7 @@ void __init timekeeping_init(void)
        ntp_clear();
 
        clock = clocksource_get_next();
-       clocksource_calculate_interval(clock,
-               (unsigned long)(current_tick_length()>>TICK_LENGTH_SHIFT));
+       clocksource_calculate_interval(clock, NTP_INTERVAL_LENGTH);
        clock->cycle_last = clocksource_read(clock);
 
        xtime.tv_sec = sec;