Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit fef76eabdf6f5bd033de2353f27dccbeea60c066

Authored by John Stultz
Committed by Greg Kroah-Hartman
1 parent 1c3a363299

hrtimer: Fix incorrect tai offset calculation for non high-res timer systems 

commit 2d926c15d629a13914ce3e5f26354f6a0ac99e70 upstream.

I noticed some CLOCK_TAI timer test failures on one of my
less-frequently used configurations. And after digging in I
found in 76f4108892d9 (Cleanup hrtimer accessors to the
timekepeing state), the hrtimer_get_softirq_time tai offset
calucation was incorrectly rewritten, as the tai offset we
return shold be from CLOCK_MONOTONIC, and not CLOCK_REALTIME.

This results in CLOCK_TAI timers expiring early on non-highres
capable machines.

This patch fixes the issue, calculating the tai time properly
from the monotonic base.

Signed-off-by: John Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1423097126-10236-1-git-send-email-john.stultz@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

kernel/time/hrtimer.c
Diff comments   View file @ fef76ea
... ... @@ -122,7 +122,7 @@
122 122 mono = ktime_get_update_offsets_tick(&off_real, &off_boot, &off_tai);
123 123 boot = ktime_add(mono, off_boot);
124 124 xtim = ktime_add(mono, off_real);
125   - tai = ktime_add(xtim, off_tai);
  125 + tai = ktime_add(mono, off_tai);
126 126  
127 127 base->clock_base[HRTIMER_BASE_REALTIME].softirq_time = xtim;
128 128 base->clock_base[HRTIMER_BASE_MONOTONIC].softirq_time = mono;