From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932618AbcJMOUx (ORCPT ); Thu, 13 Oct 2016 10:20:53 -0400 Received: from mail.efficios.com ([167.114.142.141]:39441 "EHLO mail.efficios.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932418AbcJMOUn (ORCPT ); Thu, 13 Oct 2016 10:20:43 -0400 X-Greylist: delayed 1406 seconds by postgrey-1.27 at vger.kernel.org; Thu, 13 Oct 2016 10:20:43 EDT From: Mathieu Desnoyers To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org Cc: lttng-dev@lists.lttng.org, Mathieu Desnoyers , John Stultz Subject: [PATCH lttng-modules] Fix: bump stable kernel version ranges for clock work-around Date: Thu, 13 Oct 2016 15:56:55 +0200 Message-Id: <1476367015-21624-1-git-send-email-mathieu.desnoyers@efficios.com> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linux commit 27727df240c7 ("Avoid taking lock in NMI path with CONFIG_DEBUG_TIMEKEEPING"), changed the logic to open-code the timekeeping_get_ns() function, but forgot to include the unit conversion from cycles to nanoseconds, breaking the function's output, which impacts LTTng. We expected Linux commit 58bfea9532 "timekeeping: Fix __ktime_get_fast_ns() regression" to make its way into stable kernels promptly, but it appears new stable kernel releases were done before the fix was cherry-picked from the master branch. We therefore need to bump the version ranges for the work-around in lttng-modules. Signed-off-by: Mathieu Desnoyers CC: Greg Kroah-Hartman CC: John Stultz --- wrapper/trace-clock.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h index 14d41af..496fec4 100644 --- a/wrapper/trace-clock.h +++ b/wrapper/trace-clock.h @@ -52,10 +52,10 @@ extern struct lttng_trace_clock *lttng_trace_clock; * CONFIG_DEBUG_TIMEKEEPING") introduces a buggy ktime_get_mono_fast_ns(). * This is fixed by patch "timekeeping: Fix __ktime_get_fast_ns() regression". */ -#if (LTTNG_KERNEL_RANGE(4,8,0, 4,8,1) \ - || LTTNG_KERNEL_RANGE(4,7,4, 4,7,7) \ - || LTTNG_KERNEL_RANGE(4,4,20, 4,4,24) \ - || LTTNG_KERNEL_RANGE(4,1,32, 4,1,34)) +#if (LTTNG_KERNEL_RANGE(4,8,0, 4,8,2) \ + || LTTNG_KERNEL_RANGE(4,7,4, 4,7,8) \ + || LTTNG_KERNEL_RANGE(4,4,20, 4,4,25) \ + || LTTNG_KERNEL_RANGE(4,1,32, 4,1,35)) #define LTTNG_CLOCK_NMI_SAFE_BROKEN #endif -- 2.1.4