X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=wrapper%2Ftrace-clock.h;fp=wrapper%2Ftrace-clock.h;h=649c93f358d62c9bcede2cd33bd3f890ffa412ab;hb=a9df1445c3d54e647d9aea248cc1b26bb6f15298;hp=3e8780da167ffa4b3c832eea7e8756c647091c29;hpb=2ca394649a5fb4135bfbe541f090b06ef933a63b;p=lttng-modules.git

diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h
index 3e8780da..649c93f3 100644
--- a/wrapper/trace-clock.h
+++ b/wrapper/trace-clock.h
@@ -47,7 +47,16 @@
 
 extern struct lttng_trace_clock *lttng_trace_clock;
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0))
+/*
+ * Upstream Linux commit 27727df240c7 ("Avoid taking lock in NMI path with
+ * CONFIG_DEBUG_TIMEKEEPING") introduces a buggy ktime_get_mono_fast_ns().
+ * This is fixed by patch "timekeeping: Fix __ktime_get_fast_ns() regression".
+ */
+#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))
 
 DECLARE_PER_CPU(local_t, lttng_last_tsc);