diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-05-14 11:10:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-14 12:13:11 -0700 |
| commit | d10ff3fb62bd38415c0f7be3d75d107e1f67e59a (patch) | |
| tree | 402df109059cb64f88fb26c0cf5eb86b8c9fdae3 /kernel | |
| parent | 705962ccc9d21a08b74b6b6e1d3cf10f98968a67 (diff) | |
| download | linux-stable-d10ff3fb62bd38415c0f7be3d75d107e1f67e59a.tar.gz linux-stable-d10ff3fb62bd38415c0f7be3d75d107e1f67e59a.tar.bz2 linux-stable-d10ff3fb62bd38415c0f7be3d75d107e1f67e59a.zip | |
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/timekeeping.c | 2 | ||||
| -rw-r--r-- | kernel/timer.c | 2 |
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) 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/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) prev = &curr->next; } - clocksource_resume(); - write_seqlock_irqsave(&xtime_lock, flags); if (ti == time_interpolator) { /* we lost the best time-interpolator: */ |