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

Commit 3b62dc6c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer fix from Thomas Gleixner:
 "A single fix for a thinko in the raw timekeeper update which causes
  clock MONOTONIC_RAW to run with erratically increased frequency"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  time: Fix ktime_get_raw() incorrect base accumulation
parents e92d51af 0bcdc098

kernel/time/timekeeping.c

+1 −3
Original line number Diff line number Diff line
@@ -637,9 +637,7 @@ static inline void tk_update_ktime_data(struct timekeeper *tk) 
	tk->ktime_sec = seconds;



	/* Update the monotonic raw base */

	seconds = tk->raw_sec;

	nsec = (u32)(tk->tkr_raw.xtime_nsec >> tk->tkr_raw.shift);

	tk->tkr_raw.base = ns_to_ktime(seconds * NSEC_PER_SEC + nsec);

	tk->tkr_raw.base = ns_to_ktime(tk->raw_sec * NSEC_PER_SEC);

}



/* must hold timekeeper_lock */