ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2022-03-06 11:47:59 -08:00
parent dcde98da99 1d02b444b8
commit f40a33f5ea
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/trace/trace.c
View File

@@ -235,7 +235,7 @@ static char trace_boot_options_buf[MAX_TRACER_SIZE] __initdata;
static int __init set_trace_boot_options(char *str) static int __init set_trace_boot_options(char *str)
{ {
strlcpy(trace_boot_options_buf, str, MAX_TRACER_SIZE); strlcpy(trace_boot_options_buf, str, MAX_TRACER_SIZE);
return 0; return 1;
} }
__setup("trace_options=", set_trace_boot_options); __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); strlcpy(trace_boot_clock_buf, str, MAX_TRACER_SIZE);
trace_boot_clock = trace_boot_clock_buf; trace_boot_clock = trace_boot_clock_buf;
return 0; return 1;
} }
__setup("trace_clock=", set_trace_boot_clock); __setup("trace_clock=", set_trace_boot_clock);

6
kernel/trace/trace_events_hist.c
View File

@@ -2289,9 +2289,9 @@ parse_field(struct hist_trigger_data *hist_data, struct trace_event_file *file,
/* /*
* For backward compatibility, if field_name * For backward compatibility, if field_name
* was "cpu", then we treat this the same as * 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; *flags |= HIST_FIELD_FL_CPU;
} else { } else {
hist_err(tr, HIST_ERR_FIELD_NOT_FOUND, 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) if (hist_field->flags & HIST_FIELD_FL_STACKTRACE)
cmp_fn = tracing_map_cmp_none; 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, cmp_fn = tracing_map_cmp_num(hist_field->size,
hist_field->is_signed); hist_field->is_signed);
else if (is_string_field(field)) else if (is_string_field(field))

2
kernel/trace/trace_kprobe.c
View File

@@ -32,7 +32,7 @@ static int __init set_kprobe_boot_events(char *str)
strlcpy(kprobe_boot_events_buf, str, COMMAND_LINE_SIZE); strlcpy(kprobe_boot_events_buf, str, COMMAND_LINE_SIZE);
disable_tracing_selftest("running kprobe events"); disable_tracing_selftest("running kprobe events");
return 0; return 1;
} }
__setup("kprobe_event=", set_kprobe_boot_events); __setup("kprobe_event=", set_kprobe_boot_events);