Commit 8b1e2c50 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2bd3f4ee c1d96fa6

include/trace/events/kmem.h

+3 −3
Original line number Diff line number Diff line
@@ -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,

tools/tracing/latency/latency-collector.c

+3 −3
Original line number Diff line number Diff line
@@ -1650,7 +1650,7 @@ static void start_printthread(void) 
		if (ufd <  0 ||

		    read(ufd, seed, sizeof(*seed)) != sizeof(*seed)) {

			printf(

"Warning! Using trivial random nummer seed, since %s not available\n",

"Warning! Using trivial random number seed, since %s not available\n",

			DEV_URANDOM);

			fflush(stdout);

			*seed = i;
@@ -1711,8 +1711,8 @@ static void show_usage(void) 
"\t\t\tbeginning, end, and backtrace.\n\n"



"-g, --graph\t\tEnable the display-graph option in trace_option. This\n"

"\t\t\toption causes ftrace to show the functionph of how\n"

"\t\t\tfunctions are calling other functions.\n\n"

"\t\t\toption causes ftrace to show the graph of how functions\n"

"\t\t\tare calling other functions.\n\n"



"-c, --policy POL\tRun the program with scheduling policy POL. POL can be\n"

"\t\t\tother, batch, idle, rr or fifo. The default is rr. When\n"