diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-12-18 06:26:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-12-18 06:26:07 +0100 |
| commit | 1d2a7de8e907a0c7e271a914e4bf54fedb7454a6 (patch) | |
| tree | 207306e549941fe0d437a6ea70e6bb8e849b01b5 /tools/perf/util/mmap.h | |
| parent | 10c91577d5e631773a6394e14cf60125389b71ae (diff) | |
| parent | 1291a0d5049dbc06baaaf66a9ff3f53db493b19b (diff) | |
Merge tag 'v4.15-rc4' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/mmap.h')
| -rw-r--r-- | tools/perf/util/mmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/mmap.h b/tools/perf/util/mmap.h index d640273b7762..e43d7b55a55f 100644 --- a/tools/perf/util/mmap.h +++ b/tools/perf/util/mmap.h @@ -70,7 +70,7 @@ void perf_mmap__read_catchup(struct perf_mmap *md); static inline u64 perf_mmap__read_head(struct perf_mmap *mm) { struct perf_event_mmap_page *pc = mm->base; - u64 head = ACCESS_ONCE(pc->data_head); + u64 head = READ_ONCE(pc->data_head); rmb(); return head; } |