]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
hrtimer: Fix incorrect tai offset calculation for non high-res timer systems
authorJohn Stultz <john.stultz@linaro.org>
Thu, 5 Feb 2015 00:45:26 +0000 (16:45 -0800)
committerIngo Molnar <mingo@kernel.org>
Thu, 5 Feb 2015 07:39:37 +0000 (08:39 +0100)
commit2d926c15d629a13914ce3e5f26354f6a0ac99e70
tree994bad6dd380a02a39e0c3aecab87f862de8bc5e
parentdc6d6844111d953d3fa2121da28d38be9359c911
hrtimer: Fix incorrect tai offset calculation for non high-res timer systems

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>
Cc: stable <stable@vger.kernel.org> # 3.17+
Link: http://lkml.kernel.org/r/1423097126-10236-1-git-send-email-john.stultz@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/time/hrtimer.c