Fix: add RHEL version macros

[lttng-modules.git] / wrapper / trace-clock.h

diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h
index 9c0c8067f7b1d959af34c47f396e71e4496d334c..a36140f939c1958263cf7e11ef7611d20dbfe8f9 100644 (file)
--- 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