Drop 'linux/percpu-defs.h' wrapper

[lttng-modules.git] / include / wrapper / trace-clock.h

diff --git a/include/wrapper/trace-clock.h b/include/wrapper/trace-clock.h
index 7cef08df3176f60d8a27bfd779384452c75e5da3..69dcc8003790a5ca9bb1486955237e20971cab35 100644 (file)
--- a/include/wrapper/trace-clock.h
+++ b/include/wrapper/trace-clock.h
@@ -20,12 +20,13 @@
 #include <linux/time.h>
 #include <linux/hrtimer.h>
 #include <linux/percpu.h>
-#include <linux/version.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>
 
@@ -51,7 +52,7 @@ extern struct lttng_trace_clock *lttng_trace_clock;
  * this feature on 64-bit architectures.
  */
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) \
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,17,0) \
        && BITS_PER_LONG == 64 \
        && !defined(LTTNG_CLOCK_NMI_SAFE_BROKEN))
 #define LTTNG_USE_NMI_SAFE_CLOCK
@@ -71,7 +72,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
@@ -160,33 +161,30 @@ static inline void put_trace_clock(void)
 
 static inline u64 trace_clock_read64(void)
 {
-       struct lttng_trace_clock *ltc = READ_ONCE(lttng_trace_clock);
+       struct lttng_trace_clock *ltc = LTTNG_READ_ONCE(lttng_trace_clock);
 
        if (likely(!ltc)) {
                return trace_clock_read64_monotonic();
        } else {
-               read_barrier_depends(); /* load ltc before content */
                return ltc->read64();
        }
 }
 
 static inline u64 trace_clock_freq(void)
 {
-       struct lttng_trace_clock *ltc = READ_ONCE(lttng_trace_clock);
+       struct lttng_trace_clock *ltc = LTTNG_READ_ONCE(lttng_trace_clock);
 
        if (!ltc) {
                return trace_clock_freq_monotonic();
        } else {
-               read_barrier_depends(); /* load ltc before content */
                return ltc->freq();
        }
 }
 
 static inline int trace_clock_uuid(char *uuid)
 {
-       struct lttng_trace_clock *ltc = READ_ONCE(lttng_trace_clock);
+       struct lttng_trace_clock *ltc = LTTNG_READ_ONCE(lttng_trace_clock);
 
-       read_barrier_depends(); /* load ltc before content */
        /* Use default UUID cb when NULL */
        if (!ltc || !ltc->uuid) {
                return trace_clock_uuid_monotonic(uuid);
@@ -197,24 +195,22 @@ static inline int trace_clock_uuid(char *uuid)
 
 static inline const char *trace_clock_name(void)
 {
-       struct lttng_trace_clock *ltc = READ_ONCE(lttng_trace_clock);
+       struct lttng_trace_clock *ltc = LTTNG_READ_ONCE(lttng_trace_clock);
 
        if (!ltc) {
                return trace_clock_name_monotonic();
        } else {
-               read_barrier_depends(); /* load ltc before content */
                return ltc->name();
        }
 }
 
 static inline const char *trace_clock_description(void)
 {
-       struct lttng_trace_clock *ltc = READ_ONCE(lttng_trace_clock);
+       struct lttng_trace_clock *ltc = LTTNG_READ_ONCE(lttng_trace_clock);
 
        if (!ltc) {
                return trace_clock_description_monotonic();
        } else {
-               read_barrier_depends(); /* load ltc before content */
                return ltc->description();
        }
 }