|
@@ -47,7 +47,7 @@ struct timespec wall_to_monotonic __attribute__ ((aligned (16)));
|
|
|
static unsigned long total_sleep_time; /* seconds */
|
|
|
|
|
|
static struct timespec xtime_cache __attribute__ ((aligned (16)));
|
|
|
-static inline void update_xtime_cache(u64 nsec)
|
|
|
+void update_xtime_cache(u64 nsec)
|
|
|
{
|
|
|
xtime_cache = xtime;
|
|
|
timespec_add_ns(&xtime_cache, nsec);
|
|
@@ -145,6 +145,7 @@ int do_settimeofday(struct timespec *tv)
|
|
|
|
|
|
set_normalized_timespec(&xtime, sec, nsec);
|
|
|
set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
|
|
|
+ update_xtime_cache(0);
|
|
|
|
|
|
clock->error = 0;
|
|
|
ntp_clear();
|
|
@@ -252,8 +253,8 @@ void __init timekeeping_init(void)
|
|
|
xtime.tv_nsec = 0;
|
|
|
set_normalized_timespec(&wall_to_monotonic,
|
|
|
-xtime.tv_sec, -xtime.tv_nsec);
|
|
|
+ update_xtime_cache(0);
|
|
|
total_sleep_time = 0;
|
|
|
-
|
|
|
write_sequnlock_irqrestore(&xtime_lock, flags);
|
|
|
}
|
|
|
|
|
@@ -290,6 +291,7 @@ static int timekeeping_resume(struct sys_device *dev)
|
|
|
}
|
|
|
/* Make sure that we have the correct xtime reference */
|
|
|
timespec_add_ns(&xtime, timekeeping_suspend_nsecs);
|
|
|
+ update_xtime_cache(0);
|
|
|
/* re-base the last cycle value */
|
|
|
clock->cycle_last = clocksource_read(clock);
|
|
|
clock->error = 0;
|