diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-05 06:13:52 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-05 06:13:52 +0300 |
| commit | 2f13437b8917627119d163d62f73e7a78a92303a (patch) | |
| tree | 481c5b3a204292148853cb2a8aa6de00dbdf7d63 /include/trace | |
| parent | 056df578c2dcac1e624254567f5df5ddaa223234 (diff) | |
| parent | a356646a56857c2e5ad875beec734d7145ecd49a (diff) | |
| download | linux-2f13437b8917627119d163d62f73e7a78a92303a.tar.xz | |
Merge tag 'trace-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull more tracing updates from Steven Rostedt:
"Two fixes and one patch that was missed:
Fixes:
- Missing __print_hex_dump undef for processing new function in trace
events
- Stop WARN_ON messages when lockdown disables tracing on boot up
Enhancement:
- Debug option to inject trace events from userspace (for rasdaemon)"
The enhancement has its own config option and is non invasive. It's been
discussed for sever months and should have been added to my original
push, but I never pulled it into my queue.
* tag 'trace-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Do not create directories if lockdown is in affect
tracing: Introduce trace event injection
tracing: Fix __print_hex_dump scope
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/trace_events.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h index 7089760d4c7a..472b33d23a10 100644 --- a/include/trace/trace_events.h +++ b/include/trace/trace_events.h @@ -757,6 +757,7 @@ static inline void ftrace_test_probe_##call(void) \ #undef __get_str #undef __get_bitmask #undef __print_array +#undef __print_hex_dump #undef TP_printk #define TP_printk(fmt, args...) "\"" fmt "\", " __stringify(args) |