From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752235AbcAQKoY (ORCPT ); Sun, 17 Jan 2016 05:44:24 -0500 Received: from terminus.zytor.com ([198.137.202.10]:35653 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751848AbcAQKoW (ORCPT ); Sun, 17 Jan 2016 05:44:22 -0500 Date: Sun, 17 Jan 2016 02:43:47 -0800 From: tip-bot for Thomas Gleixner Message-ID: Cc: peterz@infradead.org, hpa@zytor.com, tglx@linutronix.de, deller@gmx.de, mingo@kernel.org, john.stultz@linaro.org, linux-kernel@vger.kernel.org Reply-To: mingo@kernel.org, deller@gmx.de, linux-kernel@vger.kernel.org, john.stultz@linaro.org, hpa@zytor.com, peterz@infradead.org, tglx@linutronix.de In-Reply-To: <20160114164159.528222587@linutronix.de> References: <20160114164159.528222587@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/urgent] itimers: Handle relative timers with CONFIG_TIME_LOW_RES proper Git-Commit-ID: 51cbb5242a41700a3f250ecfb48dcfb7e4375ea4 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: 51cbb5242a41700a3f250ecfb48dcfb7e4375ea4 Gitweb: http://git.kernel.org/tip/51cbb5242a41700a3f250ecfb48dcfb7e4375ea4 Author: Thomas Gleixner AuthorDate: Thu, 14 Jan 2016 16:54:48 +0000 Committer: Thomas Gleixner CommitDate: Sun, 17 Jan 2016 11:13:55 +0100 itimers: Handle relative timers with CONFIG_TIME_LOW_RES proper As Helge reported for timerfd we have the same issue in itimers. 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.528222587@linutronix.de Signed-off-by: Thomas Gleixner --- kernel/time/itimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c index 8d262b4..1d5c720 100644 --- a/kernel/time/itimer.c +++ b/kernel/time/itimer.c @@ -26,7 +26,7 @@ */ static struct timeval itimer_get_remtime(struct hrtimer *timer) { - ktime_t rem = hrtimer_get_remaining(timer); + ktime_t rem = __hrtimer_get_remaining(timer, true); /* * Racy but safe: if the itimer expires after the above