X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=wrapper%2Ftrace-clock.h;h=1d14cb9bd1b4457950f2aa74a933fdb6a50394ee;hb=53c4007f9ea3c1bd11295dc87b97ebd1475fdb4c;hp=efb49f4c2ed57dde712b74d3855e4e2e903f700c;hpb=0dca920627c14df3ca22e244957ed5f9d91894fb;p=lttng-modules.git diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h index efb49f4c..1d14cb9b 100644 --- a/wrapper/trace-clock.h +++ b/wrapper/trace-clock.h @@ -40,7 +40,7 @@ #include #include -#if ((LTTNG_KERNEL_RANGE(3,10,0, 3,10,14) && !LTTNG_RHEL_KERNEL_RANGE(3,10,0,7,0, 3,10,14,0,0)) \ +#if ((LTTNG_KERNEL_RANGE(3,10,0, 3,10,14) && !LTTNG_RHEL_KERNEL_RANGE(3,10,0,123,0,0, 3,10,14,0,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