diff --git a/[refs] b/[refs] index f1a5fc738dc0..d00132ff9f47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33d519feaccb8a1208f736d00f53a2a73d98ffaa +refs/heads/master: 3e997130bd2e8c6f5aaa49d6e3161d4d29b43ab0 diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c index 269b1fe5f2ae..3447cfaf11e7 100644 --- a/trunk/kernel/time/timekeeping.c +++ b/trunk/kernel/time/timekeeping.c @@ -717,6 +717,7 @@ static void timekeeping_resume(void) timekeeper.clock->cycle_last = timekeeper.clock->read(timekeeper.clock); timekeeper.ntp_error = 0; timekeeping_suspended = 0; + timekeeping_update(false); write_sequnlock_irqrestore(&timekeeper.lock, flags); touch_softlockup_watchdog();