diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-16 12:09:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-16 12:09:36 -0800 |
| commit | 921d4f67bfacaa0967231a7d408414aa592ca51c (patch) | |
| tree | b23f6d0a8df29a89b38cdcda1e7d8acb03235b72 /tools/perf/scripts/python | |
| parent | a8750ddca918032d6349adbf9a4b6555e7db20da (diff) | |
| parent | 68e76e034b6b1c1ce2eece1ab8ae4008e14be470 (diff) | |
Merge tag 'trace-v4.15-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
- Bring back context level recursive protection in ring buffer.
The simpler counter protection failed, due to a path when tracing
with trace_clock_global() as it could not be reentrant and depended
on the ring buffer recursive protection to keep that from happening.
- Prevent branch profiling when FORTIFY_SOURCE is enabled.
It causes 50 - 60 MB in warning messages. Branch profiling should
never be run on production systems, so there's no reason that it
needs to be enabled with FORTIFY_SOURCE.
* tag 'trace-v4.15-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Prevent PROFILE_ALL_BRANCHES when FORTIFY_SOURCE=y
ring-buffer: Bring back context level recursive checks
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions