On Tue, May 29, 2012 at 10:56:18PM -0700, John Stultz wrote:Thanks! Is it ok if I add your Tested-by: to the patch?On 05/29/2012 10:11 PM, Richard Cochran wrote:Okay, so I can confirm that this fixes the CLOCK_MONOTONIC timer issueOn Tue, May 29, 2012 at 06:49:30PM -0700, John Stultz wrote:Yep. Good point.diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.cDon't you need this in update_wall_time() too?
index 6e46cac..81c76a9 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -962,6 +962,7 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift)
timekeeper.xtime.tv_sec++;
leap = second_overflow(timekeeper.xtime.tv_sec);
timekeeper.xtime.tv_sec += leap;
+ timekeeper.wall_to_monotonic.tv_sec -= leap;
during a leap second.