---

yaml --- r: 163071 b: refs/heads/master c: 6ea41d2 h: refs/heads/master i: 163069: b2af937 163067: ba7e50f 163063: 84ca924 163055: 8adfb71 163039: 3452d30 163007: 21b9d1b 162943: 60cebe3 162815: 78e05b1 v: v3
git-mirror · Aug 15, 2009 · 16f497a · 16f497a
1 parent e642da1
commit 16f497a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23970e389e9cee43c4b41023935e1417271708b2
+refs/heads/master: 6ea41d252f35465a2308a4038a323b6b07de06f6
diff --git a/trunk/kernel/time/clocksource.c b/trunk/kernel/time/clocksource.c
@@ -307,16 +307,23 @@ static void clocksource_watchdog_work(struct work_struct *work)
 {
 	struct clocksource *cs, *tmp;
 	unsigned long flags;
+	LIST_HEAD(unstable);
 
 	spin_lock_irqsave(&watchdog_lock, flags);
 	list_for_each_entry_safe(cs, tmp, &watchdog_list, wd_list)
 		if (cs->flags & CLOCK_SOURCE_UNSTABLE) {
 			list_del_init(&cs->wd_list);
-			clocksource_change_rating(cs, 0);
+			list_add(&cs->wd_list, &unstable);
 		}
 	/* Check if the watchdog timer needs to be stopped. */
 	clocksource_stop_watchdog();
-	spin_unlock(&watchdog_lock);
+	spin_unlock_irqrestore(&watchdog_lock, flags);
+
+	/* Needs to be done outside of watchdog lock */
+	list_for_each_entry_safe(cs, tmp, &unstable, wd_list) {
+		list_del_init(&cs->wd_list);
+		clocksource_change_rating(cs, 0);
+	}
 }
 
 #else /* CONFIG_CLOCKSOURCE_WATCHDOG */