diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-15 11:14:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-15 11:14:10 -0700 |
| commit | 7558009751a591c3be148b2569b37efb951828d8 (patch) | |
| tree | a3ca6a26c0b777a3d18a61cd4dd3ba1da7fd820c /include/linux | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | tracing: Have branch tracer use recursive field of task struct (diff) | |
| download | linux-dev-7558009751a591c3be148b2569b37efb951828d8.tar.xz linux-dev-7558009751a591c3be148b2569b37efb951828d8.zip | |
Merge tag 'trace-v4.2-rc1-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fix from Steven Rostedt:
"Fengguang Wu discovered a crash that happened to be because of the
branch tracer (traces unlikely and likely branches) when enabled with
certain debug options.
What happened was that various debug options like lockdep and
DEBUG_PREEMPT can cause parts of the branch tracer to recurse outside
its recursion protection. In fact, part of its recursion protection
used these features that caused the lockup. This cleans up the code a
little and makes the recursion protection a bit more robust"
* tag 'trace-v4.2-rc1-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Have branch tracer use recursive field of task struct
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions