From b97d469a75e0ef8a1691902ff5a7ac74064cc114 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 19 Sep 2013 13:59:48 -0500 Subject: [PATCH] LTTng trace-clock: shrink kernel blacklist The lockup fix has been pulled into Linux master as: commit 7bd36014460f793c19e7d6c94dab67b0afcfcb7f Author: John Stultz Date: Wed Sep 11 16:50:56 2013 -0700 timekeeping: Fix HRTICK related deadlock from ntp lock changes Guessing the stable kernel versions in which this fix will appear in 3.10 and 3.11 stable. 3.12+ are OK. Signed-off-by: Mathieu Desnoyers Cc: Greg Kroah-Hartman Cc: John Stultz --- wrapper/trace-clock.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h index 4266f256..d31141dc 100644 --- a/wrapper/trace-clock.h +++ b/wrapper/trace-clock.h @@ -33,10 +33,11 @@ #include #include #include +#include "../lttng-kernel-version.h" #include "random.h" -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)) -#error "Linux kernels 3.10 and 3.11 introduce a deadlock in the timekeeping subsystem. See http://lkml.kernel.org/r/1378943457-27314-1-git-send-email-john.stultz@linaro.org for details. Awaiting patch merge into Linux master, stable-3.10 and stable-3.11 for fine-grained kernel version blacklisting." +#if LTTNG_KERNEL_RANGE(3,10,0, 3,10,13) || LTTNG_KERNEL_RANGE(3,11,0, 3,11,2) +#error "Linux kernels 3.10 and 3.11 introduce a deadlock in the timekeeping subsystem. Fixed by commit 7bd36014460f793c19e7d6c94dab67b0afcfcb7f \"timekeeping: Fix HRTICK related deadlock from ntp lock changes\" in Linux." #endif static inline u64 trace_clock_monotonic_wrapper(void) -- 2.34.1