Skip to content

Commit 8b1e2c5

Browse files
committed
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
2 parents 2bd3f4e + c1d96fa commit 8b1e2c5

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

include/trace/events/kmem.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,17 @@ TRACE_EVENT(kmem_cache_free,
144144
TP_STRUCT__entry(
145145
__field( unsigned long, call_site )
146146
__field( const void *, ptr )
147-
__field( const char *, name )
147+
__string( name, name )
148148
),
149149

150150
TP_fast_assign(
151151
__entry->call_site = call_site;
152152
__entry->ptr = ptr;
153-
__entry->name = name;
153+
__assign_str(name, name);
154154
),
155155

156156
TP_printk("call_site=%pS ptr=%p name=%s",
157-
(void *)__entry->call_site, __entry->ptr, __entry->name)
157+
(void *)__entry->call_site, __entry->ptr, __get_str(name))
158158
);
159159

160160
TRACE_EVENT(mm_page_free,

tools/tracing/latency/latency-collector.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1650,7 +1650,7 @@ static void start_printthread(void)
16501650
if (ufd < 0 ||
16511651
read(ufd, seed, sizeof(*seed)) != sizeof(*seed)) {
16521652
printf(
1653-
"Warning! Using trivial random nummer seed, since %s not available\n",
1653+
"Warning! Using trivial random number seed, since %s not available\n",
16541654
DEV_URANDOM);
16551655
fflush(stdout);
16561656
*seed = i;
@@ -1711,8 +1711,8 @@ static void show_usage(void)
17111711
"\t\t\tbeginning, end, and backtrace.\n\n"
17121712

17131713
"-g, --graph\t\tEnable the display-graph option in trace_option. This\n"
1714-
"\t\t\toption causes ftrace to show the functionph of how\n"
1715-
"\t\t\tfunctions are calling other functions.\n\n"
1714+
"\t\t\toption causes ftrace to show the graph of how functions\n"
1715+
"\t\t\tare calling other functions.\n\n"
17161716

17171717
"-c, --policy POL\tRun the program with scheduling policy POL. POL can be\n"
17181718
"\t\t\tother, batch, idle, rr or fifo. The default is rr. When\n"

0 commit comments

Comments
 (0)