Merge tag 'trace-fixes-v3.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 May 2014 15:30:44 +0000 (08:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 May 2014 15:30:44 +0000 (08:30 -0700)
commit00622e61eda46c7f8833afbee6bd34449a9a4e7e
treee5bf2716392944f6bca76647f85cd591a3e639a5
parent6c6ca9c2a5b97ab37ffd1b091d15eb5cd3f1bf23
parent561a4fe851ccab9dd0d14989ab566f9392d9f8b5
Merge tag 'trace-fixes-v3.15-rc3' of git://git./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: Paul 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