diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-07-18 11:24:41 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-07-18 11:25:55 +0200 |
commit | eec19d1a0d04c80e66eef634f7b8f460f2ca5643 (patch) | |
tree | e68f24938d458fc776b76dc6037f9a2d03f09403 /kernel/time/timekeeping.c | |
parent | f726a697d06102e7a1fc0a87308cb30a84580205 (diff) | |
parent | a018540141a931f5299a866907b27886916b4374 (diff) |
Merge branch 'linus' into timers/core
Resolve semantic conflict in kernel/time/timekeeping.c.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time/timekeeping.c')
-rw-r--r-- | kernel/time/timekeeping.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 5980e902978..f045cc50832 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -745,6 +745,7 @@ static void timekeeping_resume(void) timekeeper.clock->cycle_last = timekeeper.clock->read(timekeeper.clock); timekeeper.ntp_error = 0; timekeeping_suspended = 0; + timekeeping_update(&timekeeper, false); write_sequnlock_irqrestore(&timekeeper.lock, flags); touch_softlockup_watchdog(); |