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

Commit 67dd331c authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'fortglx/3.10/time' of git://git.linaro.org/people/jstultz/linux into timers/urgent

parents 15ef0298 0d6bd995

kernel/time/ntp.c

+0 −1
Original line number Diff line number Diff line
@@ -874,7 +874,6 @@ static void hardpps_update_phase(long error) 
void __hardpps(const struct timespec *phase_ts, const struct timespec *raw_ts)

{

	struct pps_normtime pts_norm, freq_norm;

	unsigned long flags;



	pts_norm = pps_normalize_ts(*phase_ts);

kernel/time/timekeeping.c

+8 −0
Original line number Diff line number Diff line
@@ -975,6 +975,14 @@ static int timekeeping_suspend(void) 


	read_persistent_clock(&timekeeping_suspend_time);



	/*

	 * On some systems the persistent_clock can not be detected at

	 * timekeeping_init by its return value, so if we see a valid

	 * value returned, update the persistent_clock_exists flag.

	 */

	if (timekeeping_suspend_time.tv_sec || timekeeping_suspend_time.tv_nsec)

		persistent_clock_exist = true;



	raw_spin_lock_irqsave(&timekeeper_lock, flags);

	write_seqcount_begin(&timekeeper_seq);

	timekeeping_forward_now(tk);