X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Fwrapper%2Ftrace-clock.h;h=adb1101f2d0c8c6836fe1e9fc63de9dd7552fec2;hb=f39b4a3cbff6d286025bd692aaa24ae6f8efb40b;hp=e3738263bd8442b0d901822d719271928a284113;hpb=5f4c791e2ad2c814101ccdb500e65543f2792c41;p=lttng-modules.git

diff --git a/include/wrapper/trace-clock.h b/include/wrapper/trace-clock.h
index e3738263..adb1101f 100644
--- a/include/wrapper/trace-clock.h
+++ b/include/wrapper/trace-clock.h
@@ -20,14 +20,14 @@
 #include <linux/time.h>
 #include <linux/hrtimer.h>
 #include <linux/percpu.h>
+#include <linux/percpu-defs.h>
+
 #include <lttng/kernel-version.h>
 #include <asm/local.h>
 #include <lttng/kernel-version.h>
 #include <lttng/clock.h>
 #include <wrapper/compiler.h>
-#include <wrapper/percpu-defs.h>
 #include <wrapper/random.h>
-#include <blacklist/timekeeping.h>
 
 extern struct lttng_trace_clock *lttng_trace_clock;
 
@@ -38,8 +38,7 @@ extern struct lttng_trace_clock *lttng_trace_clock;
  */
 #if (LTTNG_KERNEL_RANGE(4,8,0, 4,8,2) \
 	|| LTTNG_KERNEL_RANGE(4,7,4, 4,7,8) \
-	|| LTTNG_KERNEL_RANGE(4,4,20, 4,4,25) \
-	|| LTTNG_KERNEL_RANGE(4,1,32, 4,1,35))
+	|| LTTNG_KERNEL_RANGE(4,4,20, 4,4,25))
 #define LTTNG_CLOCK_NMI_SAFE_BROKEN
 #endif
 
@@ -51,9 +50,7 @@ extern struct lttng_trace_clock *lttng_trace_clock;
  * this feature on 64-bit architectures.
  */
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,17,0) \
-	&& BITS_PER_LONG == 64 \
-	&& !defined(LTTNG_CLOCK_NMI_SAFE_BROKEN))
+#if (BITS_PER_LONG == 64 && !defined(LTTNG_CLOCK_NMI_SAFE_BROKEN))
 #define LTTNG_USE_NMI_SAFE_CLOCK
 #endif
 
@@ -71,7 +68,7 @@ static inline u64 trace_clock_monotonic_wrapper(void)
 
 	/* Use fast nmi-safe monotonic clock provided by the Linux kernel. */
 	preempt_disable();
-	last_tsc_ptr = lttng_this_cpu_ptr(&lttng_last_tsc);
+	last_tsc_ptr = this_cpu_ptr(&lttng_last_tsc);
 	last = *last_tsc_ptr;
 	/*
 	 * Read "last" before "now". It is not strictly required, but it ensures