From c6f00cb3167197b95dd3a5cab78a15a4fe17599d Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 10 Jul 2012 18:43:20 -0400 Subject: [PATCH] --- yaml --- r: 311919 b: refs/heads/master c: 4873fa070ae84a4115f0b3c9dfabc224f1bc7c51 h: refs/heads/master i: 311917: d219be7aaf5a0558f2c74285f8ba790c3cc72fce 311915: 96c6f921494647e1ef64d8650cc4bdf3c7bba30f 311911: 87a001bd3a3ef23f4d16cd4f7868d6f03f792106 311903: ec382328f670398db280f7c497a140fc284d1b9f v: v3 --- [refs] | 2 +- trunk/kernel/time/timekeeping.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 97b40eac1a3e..4404add94b97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f55a6faa384304c89cfef162768e88374d3312cb +refs/heads/master: 4873fa070ae84a4115f0b3c9dfabc224f1bc7c51 diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c index 6f46a00a1e8a..a413e5940e06 100644 --- a/trunk/kernel/time/timekeeping.c +++ b/trunk/kernel/time/timekeeping.c @@ -963,6 +963,8 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift) leap = second_overflow(timekeeper.xtime.tv_sec); timekeeper.xtime.tv_sec += leap; timekeeper.wall_to_monotonic.tv_sec -= leap; + if (leap) + clock_was_set_delayed(); } /* Accumulate raw time */ @@ -1079,6 +1081,8 @@ static void update_wall_time(void) leap = second_overflow(timekeeper.xtime.tv_sec); timekeeper.xtime.tv_sec += leap; timekeeper.wall_to_monotonic.tv_sec -= leap; + if (leap) + clock_was_set_delayed(); } timekeeping_update(false);