diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-01 09:41:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-01 09:41:02 -0700 |
| commit | aa5ff93523ebc9f4cfd9fb37d021b5204ce14657 (patch) | |
| tree | fb32c9e5ae708888d9a56066f994975dab68191b /fs/nfs | |
| parent | 60e720931556fc1034d0981460164dcf02697679 (diff) | |
| parent | b40341fad6cc2daa195f8090fd3348f18fff640a (diff) | |
Merge tag 'trace-v5.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"Two tracing fixes:
- Fix temp buffer accounting that caused a WARNING for
ftrace_dump_on_opps()
- Move the recursion check in one of the function callback helpers to
the beginning of the function, as if the rcu_is_watching() gets
traced, it will cause a recursive loop that will crash the kernel"
* tag 'trace-v5.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
ftrace: Move RCU is watching check after recursion check
tracing: Fix trace_find_next_entry() accounting of temp buffer size
Diffstat (limited to 'fs/nfs')
0 files changed, 0 insertions, 0 deletions