Namespace kernel version macros

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

diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h
index 9f4e366afbcbeecc89302a2cb205b41b3e9012e5..211c1e93ceaa9736e7b4cff8c438a20380cd0edb 100644 (file)
--- a/wrapper/trace-clock.h
+++ b/wrapper/trace-clock.h
@@ -20,7 +20,7 @@
 #include <linux/time.h>
 #include <linux/hrtimer.h>
 #include <linux/percpu.h>
-#include <linux/version.h>
+#include <lttng-kernel-version.h>
 #include <asm/local.h>
 #include <lttng-kernel-version.h>
 #include <lttng-clock.h>
@@ -51,7 +51,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
@@ -160,33 +160,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 +194,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();
        }
 }