From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752000AbcAQKoJ (ORCPT ); Sun, 17 Jan 2016 05:44:09 -0500 Received: from terminus.zytor.com ([198.137.202.10]:35648 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751848AbcAQKoD (ORCPT ); Sun, 17 Jan 2016 05:44:03 -0500 Date: Sun, 17 Jan 2016 02:43:26 -0800 From: tip-bot for Thomas Gleixner Message-ID: Cc: deller@gmx.de, peterz@infradead.org, linux-kernel@vger.kernel.org, john.stultz@linaro.org, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com Reply-To: john.stultz@linaro.org, linux-kernel@vger.kernel.org, deller@gmx.de, peterz@infradead.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de In-Reply-To: <20160114164159.450510905@linutronix.de> References: <20160114164159.450510905@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/urgent] posix-timers: Handle relative timers with CONFIG_TIME_LOW_RES proper Git-Commit-ID: 572c39172684c3711e4a03c9a7380067e2b0661c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 572c39172684c3711e4a03c9a7380067e2b0661c Gitweb: http://git.kernel.org/tip/572c39172684c3711e4a03c9a7380067e2b0661c Author: Thomas Gleixner AuthorDate: Thu, 14 Jan 2016 16:54:47 +0000 Committer: Thomas Gleixner CommitDate: Sun, 17 Jan 2016 11:13:55 +0100 posix-timers: Handle relative timers with CONFIG_TIME_LOW_RES proper As Helge reported for timerfd we have the same issue in posix timers. We return remaining time larger than the programmed relative time to user space in case of CONFIG_TIME_LOW_RES=y. Use the proper function to adjust the extra time added in hrtimer_start_range_ns(). Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: Helge Deller Cc: John Stultz Cc: linux-m68k@lists.linux-m68k.org Cc: dhowells@redhat.com Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20160114164159.450510905@linutronix.de Signed-off-by: Thomas Gleixner --- kernel/time/posix-timers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c index 31d11ac..f2826c3 100644 --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c @@ -760,7 +760,7 @@ common_timer_get(struct k_itimer *timr, struct itimerspec *cur_setting) (timr->it_sigev_notify & ~SIGEV_THREAD_ID) == SIGEV_NONE)) timr->it_overrun += (unsigned int) hrtimer_forward(timer, now, iv); - remaining = ktime_sub(hrtimer_get_expires(timer), now); + remaining = __hrtimer_expires_remaining_adjusted(timer, now); /* Return 0 only, when the timer is expired and not pending */ if (remaining.tv64 <= 0) { /*