diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 13:59:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 13:59:51 -0700 |
| commit | f79ec886f994918de057dd224fa2dfdc162bb3c3 (patch) | |
| tree | 8d66a5ebf3d2f9475a908b7c5b37675965ee1c8d /kernel/trace/trace.c | |
| parent | b0a752818bdba3d0fe9de593618ccab9f1101508 (diff) | |
| parent | f86f418059b94aa01f9342611a272ca60c583e89 (diff) | |
| download | blackbird-obmc-linux-f79ec886f994918de057dd224fa2dfdc162bb3c3.tar.gz blackbird-obmc-linux-f79ec886f994918de057dd224fa2dfdc162bb3c3.zip | |
Merge tag 'trace-v4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"Three minor updates
- Use the new GFP_RETRY_MAYFAIL to be more aggressive in allocating
memory for the ring buffer without causing OOMs
- Fix a memory leak in adding and removing instances
- Add __rcu annotation to be able to debug RCU usage of function
tracing a bit better"
* tag 'trace-v4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
trace: fix the errors caused by incompatible type of RCU variables
tracing: Fix kmemleak in instance_rmdir
tracing/ring_buffer: Try harder to allocate
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 2d0ffcc49dba..42b9355033d4 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -7774,6 +7774,7 @@ static int instance_rmdir(const char *name) } kfree(tr->topts); + free_cpumask_var(tr->tracing_cpumask); kfree(tr->name); kfree(tr); |
