X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=wrapper%2Ftrace-clock.h;h=14d41afc79b14c3d26e7a9a4a119afb57b59918b;hb=254adeb07f36a347cfe50e9eb9f8fb211e0dcaba;hp=649c93f358d62c9bcede2cd33bd3f890ffa412ab;hpb=35d30e5b4b5060c08302589d56a97cbbdd415993;p=deliverable%2Flttng-modules.git

diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h
index 649c93f3..14d41afc 100644
--- a/wrapper/trace-clock.h
+++ b/wrapper/trace-clock.h
@@ -52,11 +52,15 @@ extern struct lttng_trace_clock *lttng_trace_clock;
  * 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);