---

yaml --- r: 56357 b: refs/heads/master c: d10ff3f h: refs/heads/master i: 56355: 37ed084 v: v3
git-mirror · May 14, 2007 · 106e698 · 106e698
1 parent 18cb0ef
commit 106e698
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 705962ccc9d21a08b74b6b6e1d3cf10f98968a67
+refs/heads/master: d10ff3fb62bd38415c0f7be3d75d107e1f67e59a
diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c
@@ -273,6 +273,8 @@ static int timekeeping_resume(struct sys_device *dev)
 	unsigned long flags;
 	unsigned long now = read_persistent_clock();
 
+	clocksource_resume();
+
 	write_seqlock_irqsave(&xtime_lock, flags);
 
 	if (now && (now > timekeeping_suspend_time)) {

diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
@@ -1499,8 +1499,6 @@ unregister_time_interpolator(struct time_interpolator *ti)
 		prev = &curr->next;
 	}
 
-	clocksource_resume();
-
 	write_seqlock_irqsave(&xtime_lock, flags);
 	if (ti == time_interpolator) {
 		/* we lost the best time-interpolator: */