From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 May 2014 15:30:44 +0000 (-0700)
Subject: Merge tag 'trace-fixes-v3.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~3959
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=00622e61eda46c7f8833afbee6bd34449a9a4e7e;p=firefly-linux-kernel-4.4.55.git

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
---

00622e61eda46c7f8833afbee6bd34449a9a4e7e