Skip to content

Commit 3203ce3

Browse files
JSYoo5Brostedt
authored andcommitted
tracing: Fix tp_printk option related with tp_printk_stop_on_boot
The kernel parameter "tp_printk_stop_on_boot" starts with "tp_printk" which is the same as another kernel parameter "tp_printk". If "tp_printk" setup is called before the "tp_printk_stop_on_boot", it will override the latter and keep it from being set. This is similar to other kernel parameter issues, such as: Commit 745a600 ("um: console: Ignore console= option") or init/do_mounts.c:45 (setup function of "ro" kernel param) Fix it by checking for a "_" right after the "tp_printk" and if that exists do not process the parameter. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: JaeSang Yoo <[email protected]> [ Fixed up change log and added space after if condition ] Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent 3a92e6d commit 3203ce3

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

kernel/trace/trace.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,10 @@ __setup("trace_clock=", set_trace_boot_clock);
252252

253253
static int __init set_tracepoint_printk(char *str)
254254
{
255+
/* Ignore the "tp_printk_stop_on_boot" param */
256+
if (*str == '_')
257+
return 0;
258+
255259
if ((strcmp(str, "=0") != 0 && strcmp(str, "=off") != 0))
256260
tracepoint_printk = 1;
257261
return 1;

0 commit comments

Comments
 (0)