Merge tag 'trace-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-block.git] / kernel / trace / trace.h

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index f8343eb3c1f94e3fa26c57e503cc9e4acf6a707b..2a6d0325a76181a0a8b309eaa2b69f91b350d98a 100644 (file)
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef _LINUX_KERNEL_TRACE_H
 #define _LINUX_KERNEL_TRACE_H
@@ -1457,7 +1458,7 @@ extern struct trace_event_file *find_event_file(struct trace_array *tr,
 
 static inline void *event_file_data(struct file *filp)
 {
-       return ACCESS_ONCE(file_inode(filp)->i_private);
+       return READ_ONCE(file_inode(filp)->i_private);
 }
 
 extern struct mutex event_mutex;