diff options
| author | Ingo Molnar | 2012-07-31 17:05:27 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2012-07-31 17:05:27 +0200 |
| commit | 1f815faec46e83bc96039797151846b60875bb06 (patch) | |
| tree | 41a874f8090e3f69c8a9f13e3c85dd7a371e569b /kernel/time | |
| parent | b44d50dcacea0d485ca2ff9140f8cc28ee22f28d (diff) | |
| parent | e2b34e311be3a57c9abcb927e37a57e38913714c (diff) | |
Merge branch 'linus' into timers/urgent
Merge in Linus's branch which already has timers/core merged.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/tick-sched.c | 2 | ||||
| -rw-r--r-- | kernel/time/timekeeping.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 41be02250e08..024540f97f74 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -105,7 +105,7 @@ static ktime_t tick_init_jiffy_update(void) /* * NO HZ enabled ? */ -static int tick_nohz_enabled __read_mostly = 1; +int tick_nohz_enabled __read_mostly = 1; /* * Enable / Disable tickless mode diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 8f2aba1246f2..cf364db5589f 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(); |