From: Thomas Gleixner Date: Mon, 14 May 2007 09:10:02 +0000 (+0200) Subject: timekeeping fix patch got mis-applied X-Git-Tag: v3.12-rc1~29546 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d10ff3fb62bd38415c0f7be3d75d107e1f67e59a;p=kernel%2Fkernel-generic.git 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 [ tssk, tssk, everybody should use --fuzz=0 ] Signed-off-by: Linus Torvalds --- diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index f9217bf..3d1042f 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 a6c580a..5ec5490 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: */