Fix: lttng_this_cpu_ptr wrapper for kernel 3.19+

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

diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h
index b145b826571ee4fe3095973a0f6360de3344c9e6..1b2821a19a8b7fde4a315721944d0d66405062bb 100644 (file)
--- a/wrapper/trace-clock.h
+++ b/wrapper/trace-clock.h
@@ -36,6 +36,7 @@
 #include <linux/version.h>
 #include <asm/local.h>
 #include "../lttng-kernel-version.h"
+#include "percpu-defs.h"
 #include "random.h"
 
 #if LTTNG_KERNEL_RANGE(3,10,0, 3,10,14) || LTTNG_KERNEL_RANGE(3,11,0, 3,11,3)
@@ -97,7 +98,7 @@ static inline u64 trace_clock_monotonic_wrapper(void)
        local_t *last_tsc;
 
        /* Use fast nmi-safe monotonic clock provided by the Linux kernel. */
-       last_tsc = &__get_cpu_var(lttng_last_tsc);
+       last_tsc = lttng_this_cpu_ptr(&lttng_last_tsc);
        last = local_read(last_tsc);
        /*
         * Read "last" before "now". It is not strictly required, but it ensures
@@ -140,11 +141,6 @@ static inline u64 trace_clock_monotonic_wrapper(void)
 }
 #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) */
 
-static inline u32 trace_clock_read32(void)
-{
-       return (u32) trace_clock_monotonic_wrapper();
-}
-
 static inline u64 trace_clock_read64(void)
 {
        return (u64) trace_clock_monotonic_wrapper();