diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-02-17 20:44:20 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-02-17 20:44:20 +0100 |
| commit | 6b5567b1b21b0efc544b154dc023b7dd4b4dcf4c (patch) | |
| tree | 49737aa9d6b50154c37ac9b2d6f6021b9eab61c1 /kernel/trace | |
| parent | ipv6/addrconf: ensure addrconf_verify_rtnl() has completed (diff) | |
| parent | Merge tag 'net-5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | linux-6b5567b1b21b0efc544b154dc023b7dd4b4dcf4c.tar.xz linux-6b5567b1b21b0efc544b154dc023b7dd4b4dcf4c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index c860f582b078..7c2578efde26 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -252,6 +252,10 @@ __setup("trace_clock=", set_trace_boot_clock); static int __init set_tracepoint_printk(char *str) { + /* Ignore the "tp_printk_stop_on_boot" param */ + if (*str == '_') + return 0; + if ((strcmp(str, "=0") != 0 && strcmp(str, "=off") != 0)) tracepoint_printk = 1; return 1; |