From 22dcdb38f2fcce9a80133323b2403ac2f2671558 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 19 Mar 2008 17:01:08 -0700
Subject: [PATCH] --- yaml --- r: 87519 b: refs/heads/master c:
 3150e63df41450a795bbd0bd98a8e70da74e0285 h: refs/heads/master i:   87517:
 f2fad4bb45b99a8fff50488ae93ab600c5f7c1f7   87515:
 97748fdf882a7c089869bdb4bd837fb5b051b7b1   87511:
 ff567530a0a03c1da3fb9e50ffeb1fe877e887bd   87503:
 4a1956343dec4b418877c275747eaf58e30e334f   87487:
 de8df1539f3811394ee55c51ea7f815189248de2 v: v3

---
 [refs]                          |  2 +-
 trunk/kernel/time/clocksource.c | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index d47f4b19527e..ed6986593903 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf821e8f53e3d147ebae03c8c710d2b8842d88a1
+refs/heads/master: 3150e63df41450a795bbd0bd98a8e70da74e0285
diff --git a/trunk/kernel/time/clocksource.c b/trunk/kernel/time/clocksource.c
index 548c436a776b..278534bbca95 100644
--- a/trunk/kernel/time/clocksource.c
+++ b/trunk/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)
@@ -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);
 			}
 		}
 	}