diff options
| -rw-r--r-- | kernel/trace/trace.c | 5 | ||||
| -rw-r--r-- | kernel/trace/trace_events.c | 16 |
2 files changed, 10 insertions, 11 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 7fe7cc987dab..2198a630ef58 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -3636,10 +3636,9 @@ static void __init apply_trace_boot_options(void) if (!option) break; - if (!*option) - continue; - trace_set_options(&global_trace, option); + if (*option) + trace_set_options(&global_trace, option); /* Put back the comma to allow this to be called again */ if (buf) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 292bccf3e011..bee1e1530052 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -3042,16 +3042,16 @@ early_enable_events(struct trace_array *tr, bool disable_first) if (!token) break; - if (!*token) - continue; - /* Restarting syscalls requires that we stop them first */ - if (disable_first) - ftrace_set_clr_event(tr, token, 0); + if (*token) { + /* Restarting syscalls requires that we stop them first */ + if (disable_first) + ftrace_set_clr_event(tr, token, 0); - ret = ftrace_set_clr_event(tr, token, 1); - if (ret) - pr_warn("Failed to enable trace event: %s\n", token); + ret = ftrace_set_clr_event(tr, token, 1); + if (ret) + pr_warn("Failed to enable trace event: %s\n", token); + } /* Put back the comma to allow this to be called again */ if (buf) |