diff options
author | 2013-11-05 16:03:17 -0500 | |
---|---|---|
committer | 2013-11-05 16:03:17 -0500 | |
commit | 44847da1b921f35b348ecd46df93abfbcd547355 (patch) | |
tree | 0dcc929a02b98dcf0927b9ad70083087c6d0e4ae /kernel/trace/trace_branch.c | |
parent | ftrace/x86: skip over the breakpoint for ftrace caller (diff) | |
parent | rcu: Consistent rcu_is_watching() naming (diff) | |
download | wireguard-linux-44847da1b921f35b348ecd46df93abfbcd547355.tar.xz wireguard-linux-44847da1b921f35b348ecd46df93abfbcd547355.zip |
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/trace_branch.c')
0 files changed, 0 insertions, 0 deletions