diff options
| author | Petr Mladek <pmladek@suse.com> | 2026-09-09 09:52:21 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2026-09-09 09:52:21 +0200 |
| commit | a76f015d424e1956e7be9ead2224ab9816be5d79 (patch) | |
| tree | c35a46695cac79752279d9cb26daa3b56947cd60 /kernel | |
| parent | 560f4deda32785e260056200f8bb911c475c5b88 (diff) | |
| parent | ffe0486b139e45cd9c9ca2584f04a1910fe4f8a6 (diff) | |
Merge branch 'for-7.4-trivial' into for-linus
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/printk/nbcon.c | 2 | ||||
| -rw-r--r-- | kernel/printk/printk.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/printk/nbcon.c b/kernel/printk/nbcon.c index c8502fc4f4e5..d17704fe93ae 100644 --- a/kernel/printk/nbcon.c +++ b/kernel/printk/nbcon.c @@ -1382,7 +1382,7 @@ bool nbcon_kthread_create(struct console *con) return true; kt = kthread_run(nbcon_kthread_func, con, "pr/%s%d", con->name, con->index); - if (WARN_ON(IS_ERR(kt))) { + if (IS_ERR(kt)) { con_printk(KERN_ERR, con, "failed to start printing thread\n"); return false; } diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 3fcdf4b4e2e5..6d3d18a50da7 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -3732,7 +3732,7 @@ static bool legacy_kthread_create(void) lockdep_assert_console_list_lock_held(); kt = kthread_run(legacy_kthread_func, NULL, "pr/legacy"); - if (WARN_ON(IS_ERR(kt))) { + if (IS_ERR(kt)) { pr_err("failed to start legacy printing thread\n"); return false; } |
