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 | |
| parent | printf: add support for printing symbolic error names (diff) | |
| parent | tools lib api: Renaming pr_warning to pr_warn (diff) | |
| download | linux-fd612402152fcbc54c482971d97475e38bc1ccd7.tar.gz linux-fd612402152fcbc54c482971d97475e38bc1ccd7.zip | |
Merge branch 'for-5.5-pr-warn' into for-5.5
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/dma/debug.c | 2 | ||||
| -rw-r--r-- | kernel/trace/trace_benchmark.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c index 099002d84f46..a26170469543 100644 --- a/kernel/dma/debug.c +++ b/kernel/dma/debug.c @@ -161,7 +161,7 @@ static inline void dump_entry_trace(struct dma_debug_entry *entry) { #ifdef CONFIG_STACKTRACE if (entry) { - pr_warning("Mapped at:\n"); + pr_warn("Mapped at:\n"); stack_trace_print(entry->stack_entries, entry->stack_len, 0); } #endif 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); } |