Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d10ff3fb authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
[ tssk, tssk, everybody should use --fuzz=0 ]
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 705962cc

kernel/time/timekeeping.c

+2 −0
Original line number Diff line number Diff line
@@ -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)) {

kernel/timer.c

+0 −2
Original line number Diff line number Diff line
@@ -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: */