projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: ACCESS_ONCE() removed in kernel 4.15
[lttng-modules.git]
/
wrapper
/
trace-clock.h
diff --git
a/wrapper/trace-clock.h
b/wrapper/trace-clock.h
index 7f17ccd4f82fd9bcb51446bfda45e6c778c10079..08f99229225e6e870d5d78d13d0446f5cc357b0c 100644
(file)
--- a/
wrapper/trace-clock.h
+++ b/
wrapper/trace-clock.h
@@
-37,6
+37,7
@@
#include <asm/local.h>
#include <lttng-kernel-version.h>
#include <lttng-clock.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 <wrapper/percpu-defs.h>
#include <wrapper/random.h>
@@
-176,7
+177,7
@@
static inline void put_trace_clock(void)
static inline u64 trace_clock_read64(void)
{
static inline u64 trace_clock_read64(void)
{
- struct lttng_trace_clock *ltc =
ACCESS
_ONCE(lttng_trace_clock);
+ struct lttng_trace_clock *ltc =
READ
_ONCE(lttng_trace_clock);
if (likely(!ltc)) {
return trace_clock_read64_monotonic();
if (likely(!ltc)) {
return trace_clock_read64_monotonic();
@@
-188,7
+189,7
@@
static inline u64 trace_clock_read64(void)
static inline u64 trace_clock_freq(void)
{
static inline u64 trace_clock_freq(void)
{
- struct lttng_trace_clock *ltc =
ACCESS
_ONCE(lttng_trace_clock);
+ struct lttng_trace_clock *ltc =
READ
_ONCE(lttng_trace_clock);
if (!ltc) {
return trace_clock_freq_monotonic();
if (!ltc) {
return trace_clock_freq_monotonic();
@@
-200,7
+201,7
@@
static inline u64 trace_clock_freq(void)
static inline int trace_clock_uuid(char *uuid)
{
static inline int trace_clock_uuid(char *uuid)
{
- struct lttng_trace_clock *ltc =
ACCESS
_ONCE(lttng_trace_clock);
+ struct lttng_trace_clock *ltc =
READ
_ONCE(lttng_trace_clock);
read_barrier_depends(); /* load ltc before content */
/* Use default UUID cb when NULL */
read_barrier_depends(); /* load ltc before content */
/* Use default UUID cb when NULL */
@@
-213,7
+214,7
@@
static inline int trace_clock_uuid(char *uuid)
static inline const char *trace_clock_name(void)
{
static inline const char *trace_clock_name(void)
{
- struct lttng_trace_clock *ltc =
ACCESS
_ONCE(lttng_trace_clock);
+ struct lttng_trace_clock *ltc =
READ
_ONCE(lttng_trace_clock);
if (!ltc) {
return trace_clock_name_monotonic();
if (!ltc) {
return trace_clock_name_monotonic();
@@
-225,7
+226,7
@@
static inline const char *trace_clock_name(void)
static inline const char *trace_clock_description(void)
{
static inline const char *trace_clock_description(void)
{
- struct lttng_trace_clock *ltc =
ACCESS
_ONCE(lttng_trace_clock);
+ struct lttng_trace_clock *ltc =
READ
_ONCE(lttng_trace_clock);
if (!ltc) {
return trace_clock_description_monotonic();
if (!ltc) {
return trace_clock_description_monotonic();
This page took
0.025366 seconds
and
4
git commands to generate.