2 files changed, 9 insertions, 11 deletions

diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 548c436a776b..7f60097d443a 100644
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c
@@ -141,13 +141,8 @@ static void clocksource_watchdog(unsigned long data)
         }
 
         if (!list_empty(&watchdog_list)) {
-                /* Cycle through CPUs to check if the CPUs stay synchronized to
-                 * each other. */
-                int next_cpu = next_cpu(raw_smp_processor_id(), cpu_online_map);
-                if (next_cpu >= NR_CPUS)
-                        next_cpu = first_cpu(cpu_online_map);
-                watchdog_timer.expires += WATCHDOG_INTERVAL;
-                add_timer_on(&watchdog_timer, next_cpu);
+                __mod_timer(&watchdog_timer,
+                            watchdog_timer.expires + WATCHDOG_INTERVAL);
         }
         spin_unlock(&watchdog_lock);
 }
@@ -169,7 +164,7 @@ static void clocksource_check_watchdog(struct clocksource *cs)
                 if (!started && watchdog) {
                         watchdog_last = watchdog->read();
                         watchdog_timer.expires = jiffies + WATCHDOG_INTERVAL;
-                        add_timer_on(&watchdog_timer, first_cpu(cpu_online_map));
+                        add_timer(&watchdog_timer);
                 }
         } else {
                 if (cs->flags & CLOCK_SOURCE_IS_CONTINUOUS)
@@ -179,7 +174,7 @@ static void clocksource_check_watchdog(struct clocksource *cs)
                         if (watchdog)
                                 del_timer(&watchdog_timer);
                         watchdog = cs;
-                        init_timer_deferrable(&watchdog_timer);
+                        init_timer(&watchdog_timer);
                         watchdog_timer.function = clocksource_watchdog;
 
                         /* Reset watchdog cycles */
@@ -190,8 +185,7 @@ static void clocksource_check_watchdog(struct clocksource *cs)
                                 watchdog_last = watchdog->read();
                                 watchdog_timer.expires =
                                         jiffies + WATCHDOG_INTERVAL;
-                                add_timer_on(&watchdog_timer,
-                                                first_cpu(cpu_online_map));
+                                add_timer(&watchdog_timer);
                         }
                 }
         }
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 671af612b768..a3fa587c350c 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -191,8 +191,12 @@ static void change_clocksource(void)
 
         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) { }