X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=wrapper%2Ftrace-clock.h;h=ad600ddce31fc8c1a1823d5a21a9c5d3bf029c61;hb=8d2c7a7c203b62bca1705870256388e2ff7a583c;hp=561094b3ae924a6545cf795f0ba838040c1273fe;hpb=4873090fa6bec2e0dc03f8acf5309b38207bf4dd;p=lttng-modules.git diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h index 561094b3..ad600ddc 100644 --- a/wrapper/trace-clock.h +++ b/wrapper/trace-clock.h @@ -39,7 +39,7 @@ #include "percpu-defs.h" #include "random.h" -#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