X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=wrapper%2Ftrace-clock.h;h=05472dc1cebcb341970e2f659ca64f1cefc058fa;hb=2c888988d791b02d81a940a62fd7e240359c91e7;hp=001b4f404298f55c77784c8f256905192dbbd2d0;hpb=95678343cec9739f31cca5fd69e7ede74b2725a4;p=lttng-modules.git

diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h
index 001b4f40..05472dc1 100644
--- a/wrapper/trace-clock.h
+++ b/wrapper/trace-clock.h
@@ -49,11 +49,15 @@
  * CONFIG_DEBUG_TIMEKEEPING") introduces a buggy ktime_get_mono_fast_ns().
  * This is fixed by patch "timekeeping: Fix __ktime_get_fast_ns() regression".
  */
+#if (LTTNG_KERNEL_RANGE(4,8,0, 4,8,1) \
+	|| LTTNG_KERNEL_RANGE(4,7,4, 4,7,7) \
+	|| LTTNG_KERNEL_RANGE(4,4,20, 4,4,24) \
+	|| LTTNG_KERNEL_RANGE(4,1,32, 4,1,34))
+#define LTTNG_CLOCK_NMI_SAFE_BROKEN
+#endif
+
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) \
-	&& !LTTNG_KERNEL_RANGE(4,8,0, 4,8,1) \
-	&& !LTTNG_KERNEL_RANGE(4,7,4, 4,7,7) \
-	&& !LTTNG_KERNEL_RANGE(4,4,20, 4,4,24) \
-	&& !LTTNG_KERNEL_RANGE(4,1,32, 4,1,34))
+	&& !defined(LTTNG_CLOCK_NMI_SAFE_BROKEN))
 
 DECLARE_PER_CPU(local_t, lttng_last_tsc);