summaryrefslogtreecommitdiffstats
path: root/kernel/trace/ftrace.c
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2013-11-05 16:03:17 -0500
committerSteven Rostedt <rostedt@goodmis.org>2013-11-05 16:03:17 -0500
commit44847da1b921f35b348ecd46df93abfbcd547355 (patch)
tree0dcc929a02b98dcf0927b9ad70083087c6d0e4ae /kernel/trace/ftrace.c
parentab4ead02ec235d706d0611d8741964628291237e (diff)
parent5c173eb8bcb9c1aa888bd6d14a4cb746f3dd2420 (diff)
downloadop-kernel-dev-44847da1b921f35b348ecd46df93abfbcd547355.zip
op-kernel-dev-44847da1b921f35b348ecd46df93abfbcd547355.tar.gz
Merge branch 'idle.2013.09.25a' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into HEAD
Need to use Paul McKenney's "rcu_is_watching()" changes to fix a perf/ftrace bug.
Diffstat (limited to 'kernel/trace/ftrace.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud