diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-26 10:14:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-26 10:14:18 -0800 |
| commit | 8b1e2c50bce9f3cc4422c3ed087252b8347da77a (patch) | |
| tree | b29229b5f1a439fa43d6ecd14c6b0bbe88976a1e /include/trace | |
| parent | Merge tag 'orphan-handling-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux (diff) | |
| parent | tracing/tools: fix a couple of spelling mistakes (diff) | |
| download | linux-dev-8b1e2c50bce9f3cc4422c3ed087252b8347da77a.tar.xz linux-dev-8b1e2c50bce9f3cc4422c3ed087252b8347da77a.zip | |
Merge tag 'trace-v5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"Two fixes:
- Fix an unsafe printf string usage in a kmem trace event
- Fix spelling in output from the latency-collector tool"
* tag 'trace-v5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing/tools: fix a couple of spelling mistakes
mm, tracing: Fix kmem_cache_free trace event to not print stale pointers
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/kmem.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h index 40845b0d5dad..3a60b6b6db32 100644 --- a/include/trace/events/kmem.h +++ b/include/trace/events/kmem.h @@ -144,17 +144,17 @@ TRACE_EVENT(kmem_cache_free, TP_STRUCT__entry( __field( unsigned long, call_site ) __field( const void *, ptr ) - __field( const char *, name ) + __string( name, name ) ), TP_fast_assign( __entry->call_site = call_site; __entry->ptr = ptr; - __entry->name = name; + __assign_str(name, name); ), TP_printk("call_site=%pS ptr=%p name=%s", - (void *)__entry->call_site, __entry->ptr, __entry->name) + (void *)__entry->call_site, __entry->ptr, __get_str(name)) ); TRACE_EVENT(mm_page_free, |