X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=wrapper%2Ftrace-clock.h;fp=wrapper%2Ftrace-clock.h;h=a36140f939c1958263cf7e11ef7611d20dbfe8f9;hb=7bcdff657b7a6a754e07d2ed285e9c2d8c9f3cfa;hp=9c0c8067f7b1d959af34c47f396e71e4496d334c;hpb=247c3cd66b24d6622c84806a66482b30a20a3a90;p=lttng-modules.git

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