Commit f40a33f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-v5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace 

Pull tracing fixes from Steven Rostedt:

 - Fix sorting on old "cpu" value in histograms

 - Fix return value of __setup() boot parameter handlers

* tag 'trace-v5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix return value of __setup handlers
  tracing/histogram: Fix sorting on old "cpu" value
parents dcde98da 1d02b444

kernel/trace/trace.c

+2 −2
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static char trace_boot_options_buf[MAX_TRACER_SIZE] __initdata; 
static int __init set_trace_boot_options(char *str)

{

	strlcpy(trace_boot_options_buf, str, MAX_TRACER_SIZE);

	return 0;

	return 1;

}

__setup("trace_options=", set_trace_boot_options);
@@ -246,7 +246,7 @@ static int __init set_trace_boot_clock(char *str) 
{

	strlcpy(trace_boot_clock_buf, str, MAX_TRACER_SIZE);

	trace_boot_clock = trace_boot_clock_buf;

	return 0;

	return 1;

}

__setup("trace_clock=", set_trace_boot_clock);

kernel/trace/trace_events_hist.c

+3 −3
Original line number Diff line number Diff line
@@ -2289,9 +2289,9 @@ parse_field(struct hist_trigger_data *hist_data, struct trace_event_file *file, 
			/*

			 * For backward compatibility, if field_name

			 * was "cpu", then we treat this the same as

			 * common_cpu.

			 * common_cpu. This also works for "CPU".

			 */

			if (strcmp(field_name, "cpu") == 0) {

			if (field && field->filter_type == FILTER_CPU) {

				*flags |= HIST_FIELD_FL_CPU;

			} else {

				hist_err(tr, HIST_ERR_FIELD_NOT_FOUND,
@@ -4832,7 +4832,7 @@ static int create_tracing_map_fields(struct hist_trigger_data *hist_data) 


			if (hist_field->flags & HIST_FIELD_FL_STACKTRACE)

				cmp_fn = tracing_map_cmp_none;

			else if (!field)

			else if (!field || hist_field->flags & HIST_FIELD_FL_CPU)

				cmp_fn = tracing_map_cmp_num(hist_field->size,

							     hist_field->is_signed);

			else if (is_string_field(field))

kernel/trace/trace_kprobe.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static int __init set_kprobe_boot_events(char *str) 
	strlcpy(kprobe_boot_events_buf, str, COMMAND_LINE_SIZE);

	disable_tracing_selftest("running kprobe events");



	return 0;

	return 1;

}

__setup("kprobe_event=", set_kprobe_boot_events);