aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-05-14 05:10:02 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-14 15:13:11 -0400
commitd10ff3fb62bd38415c0f7be3d75d107e1f67e59a (patch)
tree402df109059cb64f88fb26c0cf5eb86b8c9fdae3
parent705962ccc9d21a08b74b6b6e1d3cf10f98968a67 (diff)
timekeeping fix patch got mis-applied
The time keeping code move to kernel/time/timekeeping.c broke the clocksource resume logic patch, which got applied to the old file by a fuzzy application. Fix it up and move the clocksource_resume() call to the appropriate place. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> [ tssk, tssk, everybody should use --fuzz=0 ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/time/timekeeping.c2
-rw-r--r--kernel/timer.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index f9217bf644f6..3d1042f82a68 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -273,6 +273,8 @@ static int timekeeping_resume(struct sys_device *dev)
273 unsigned long flags; 273 unsigned long flags;
274 unsigned long now = read_persistent_clock(); 274 unsigned long now = read_persistent_clock();
275 275
276 clocksource_resume();
277
276 write_seqlock_irqsave(&xtime_lock, flags); 278 write_seqlock_irqsave(&xtime_lock, flags);
277 279
278 if (now && (now > timekeeping_suspend_time)) { 280 if (now && (now > timekeeping_suspend_time)) {
diff --git a/kernel/timer.c b/kernel/timer.c
index a6c580ac084b..5ec5490f8d85 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1499,8 +1499,6 @@ unregister_time_interpolator(struct time_interpolator *ti)
1499 prev = &curr->next; 1499 prev = &curr->next;
1500 } 1500 }
1501 1501
1502 clocksource_resume();
1503
1504 write_seqlock_irqsave(&xtime_lock, flags); 1502 write_seqlock_irqsave(&xtime_lock, flags);
1505 if (ti == time_interpolator) { 1503 if (ti == time_interpolator) {
1506 /* we lost the best time-interpolator: */ 1504 /* we lost the best time-interpolator: */