From 106e69803d9d2eb4e1af449f57c3e4f7545345ae Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 14 May 2007 11:10:02 +0200 Subject: [PATCH] --- yaml --- r: 56357 b: refs/heads/master c: d10ff3fb62bd38415c0f7be3d75d107e1f67e59a h: refs/heads/master i: 56355: 37ed0844d493c43c667cb270ca72800946c8911a v: v3 --- [refs] | 2 +- trunk/kernel/time/timekeeping.c | 2 ++ trunk/kernel/timer.c | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 34007b38e8d2..bcf8f4fa91ae 100644 --- 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 index f9217bf644f6..3d1042f82a68 100644 --- 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 index a6c580ac084b..5ec5490f8d85 100644 --- 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: */