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

torvalds · torvalds · commit 3b62dc6c38d1 · 2017-09-03T09:30:40.000-07:00
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
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -637,9 +637,7 @@ static inline void tk_update_ktime_data(struct timekeeper *tk)`
`637`	`637`	`tk->ktime_sec = seconds;`
`638`	`638`
`639`	`639`	`/* Update the monotonic raw base */`
`640`		`- seconds = tk->raw_sec;`
`641`		`- nsec = (u32)(tk->tkr_raw.xtime_nsec >> tk->tkr_raw.shift);`
`642`		`- tk->tkr_raw.base = ns_to_ktime(seconds * NSEC_PER_SEC + nsec);`
	`640`	`+ tk->tkr_raw.base = ns_to_ktime(tk->raw_sec * NSEC_PER_SEC);`
`643`	`641`	`}`
`644`	`642`
`645`	`643`	`/* must hold timekeeper_lock */`