diff options
| author | Petr Mladek <pmladek@suse.com> | 2023-09-04 11:37:37 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2023-09-04 11:37:37 +0200 |
| commit | f0f692395353b99a54f7f6e5a8684d73af504879 (patch) | |
| tree | 3725700932e1782a10a2fe52dc8d262ad9520a4a /kernel/printk/printk_safe.c | |
| parent | Merge branch 'for-6.6-vsprintf-doc' into for-linus (diff) | |
| parent | printk: Rename abandon_console_lock_in_panic() to other_cpu_in_panic() (diff) | |
| download | linux-f0f692395353b99a54f7f6e5a8684d73af504879.tar.xz linux-f0f692395353b99a54f7f6e5a8684d73af504879.zip | |
Merge branch 'rework/misc-cleanups' into for-linus
Diffstat (limited to 'kernel/printk/printk_safe.c')
| -rw-r--r-- | kernel/printk/printk_safe.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c index ef0f9a2044da..6d10927a07d8 100644 --- a/kernel/printk/printk_safe.c +++ b/kernel/printk/printk_safe.c @@ -38,13 +38,8 @@ asmlinkage int vprintk(const char *fmt, va_list args) * Use the main logbuf even in NMI. But avoid calling console * drivers that might have their own locks. */ - if (this_cpu_read(printk_context) || in_nmi()) { - int len; - - len = vprintk_store(0, LOGLEVEL_DEFAULT, NULL, fmt, args); - defer_console_output(); - return len; - } + if (this_cpu_read(printk_context) || in_nmi()) + return vprintk_deferred(fmt, args); /* No obstacles. */ return vprintk_default(fmt, args); |