Commit-ID: 5cd10e7946d28cfc42442fee2e6c757e244d756e Gitweb: http://git.kernel.org/tip/5cd10e7946d28cfc42442fee2e6c757e244d756e Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Wed, 2 Mar 2011 16:58:30 +0100 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Wed, 2 Mar 2011 17:20:00 +0100 hrtimer: Update base[CLOCK_BOOTTIME].offset correctly We calculate the current time of each clock base by adding an offset to clock_monotonic. The offset for the clock bases is set in retrigger_next_event() which is called when we switch a cpu to highres mode or when the clock was set. Add the missing update for clock boottime. Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: John Stultz <johnstul@xxxxxxxxxx> --- kernel/hrtimer.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 4c53af1..f679a2d 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -635,6 +635,8 @@ static void retrigger_next_event(void *arg) raw_spin_lock(&base->lock); base->clock_base[HRTIMER_BASE_REALTIME].offset = timespec_to_ktime(realtime_offset); + base->clock_base[HRTIMER_BASE_BOOTTIME].offset = + timespec_to_ktime(sleep); hrtimer_force_reprogram(base, 0); raw_spin_unlock(&base->lock); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|