Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00622e61 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-fixes-v3.15-rc3' of... 

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



Pull tracing fix from Steven Rostedt:
 "This is a small fix where the trigger code used the wrong
  rcu_dereference().  It required rcu_dereference_sched() instead of the
  normal rcu_dereference().  It produces a nasty RCU lockdep splat due
  to the incorrect rcu notation"

Acked-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>

* tag 'trace-fixes-v3.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Use rcu_dereference_sched() for trace event triggers
parents 6c6ca9c2 561a4fe8

kernel/trace/trace_events_trigger.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ event_triggers_call(struct ftrace_event_file *file, void *rec) 
			data->ops->func(data);

			continue;

		}

		filter = rcu_dereference(data->filter);

		filter = rcu_dereference_sched(data->filter);

		if (filter && !filter_match_preds(filter, rec))

			continue;

		if (data->cmd_ops->post_trigger) {