Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 563e80f9006a438442dcfb1736e846aca7959b63..947ba433865f410ca7a0c9b9b3533830c4203b72 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2642,10 +2642,10 @@ static void ftrace_exports(struct ring_buffer_event *event)
 
        preempt_disable_notrace();
 
-       export = rcu_dereference_raw_notrace(ftrace_exports_list);
+       export = rcu_dereference_raw_check(ftrace_exports_list);
        while (export) {
                trace_process_export(export, event);
-               export = rcu_dereference_raw_notrace(export->next);
+               export = rcu_dereference_raw_check(export->next);
        }
 
        preempt_enable_notrace();