From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 27 Sep 2013 18:10:40 +0000 (-0400)
Subject: Blacklist kernels 3.10.13 and 3.11.2
X-Git-Tag: v2.4.0-rc1~10
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=e14bf96416c39675a5f785b032d1c5279020b93d;p=lttng-modules.git

Blacklist kernels 3.10.13 and 3.11.2

It looks like my guessing on kernel version at which Greg will pull this
fix was wrong. It will probably appear in the next round of stable
releases.

The fix that needs to reach stable-3.10 and stable-3.11 before we can
remove those from the backlist:

commit 7bd36014460f793c19e7d6c94dab67b0afcfcb7f
Author: John Stultz <john.stultz@linaro.org>
Date:   Wed Sep 11 16:50:56 2013 -0700

    timekeeping: Fix HRTICK related deadlock from ntp lock changes

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: John Stultz <john.stultz@linaro.org>
---

diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h
index d31141dc..9c0c8067 100644
--- a/wrapper/trace-clock.h
+++ b/wrapper/trace-clock.h
@@ -36,7 +36,7 @@
 #include "../lttng-kernel-version.h"
 #include "random.h"
 
-#if LTTNG_KERNEL_RANGE(3,10,0, 3,10,13) || LTTNG_KERNEL_RANGE(3,11,0, 3,11,2)
+#if LTTNG_KERNEL_RANGE(3,10,0, 3,10,14) || LTTNG_KERNEL_RANGE(3,11,0, 3,11,3)
 #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