Merge branch 'master' into for-linus

Conflicts:
	block/Kconfig

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 0804cd594803..601ad7744247 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -699,9 +699,9 @@ __attribute__((section("_ftrace_events"))) event_##call = {		\
  *      __cpu = smp_processor_id();
  *
  *      if (in_nmi())
- *              trace_buf = rcu_dereference(perf_trace_buf_nmi);
+ *              trace_buf = rcu_dereference_sched(perf_trace_buf_nmi);
  *      else
- *              trace_buf = rcu_dereference(perf_trace_buf);
+ *              trace_buf = rcu_dereference_sched(perf_trace_buf);
  *
  *      if (!trace_buf)
  *              goto end;