diff options
| author | Petr Mladek <pmladek@suse.com> | 2019-10-18 16:40:52 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2019-10-18 16:40:52 +0200 |
| commit | fd612402152fcbc54c482971d97475e38bc1ccd7 (patch) | |
| tree | 1bf9d4d4e2c9c1cb0e68a31b85adba486299c174 /kernel/trace | |
| parent | 57f5677e535ba24b8926a7125be2ef8d7f09323c (diff) | |
| parent | c405c37bd9022ece118099fa39040bee8c5adbff (diff) | |
Merge branch 'for-5.5-pr-warn' into for-5.5
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_benchmark.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_benchmark.c b/kernel/trace/trace_benchmark.c index 80e0b2aca703..2e9a4746ea85 100644 --- a/kernel/trace/trace_benchmark.c +++ b/kernel/trace/trace_benchmark.c @@ -178,14 +178,14 @@ static int benchmark_event_kthread(void *arg) int trace_benchmark_reg(void) { if (!ok_to_run) { - pr_warning("trace benchmark cannot be started via kernel command line\n"); + pr_warn("trace benchmark cannot be started via kernel command line\n"); return -EBUSY; } bm_event_thread = kthread_run(benchmark_event_kthread, NULL, "event_benchmark"); if (IS_ERR(bm_event_thread)) { - pr_warning("trace benchmark failed to create kernel thread\n"); + pr_warn("trace benchmark failed to create kernel thread\n"); return PTR_ERR(bm_event_thread); } |