From: John Ogness Date: Mon, 9 Dec 2024 11:17:45 +0000 (+0106) Subject: printk: Remove redundant deferred check in vprintk() X-Git-Tag: v6.14-rc1~183^2^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1c21cf470595c4561d4671fd499af94152175d5;p=thirdparty%2Fkernel%2Flinux.git printk: Remove redundant deferred check in vprintk() The helper printk_get_console_flush_type() is already calling is_printk_legacy_deferred() to determine if legacy printing is to be offloaded. Therefore there is no need for vprintk() to perform this check as well. Remove the redundant check from vprintk(). Signed-off-by: John Ogness Reviewed-by: Petr Mladek Link: https://lore.kernel.org/r/20241209111746.192559-2-john.ogness@linutronix.de Signed-off-by: Petr Mladek --- diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c index 6f94418d53ffb..6283bc0b55e6d 100644 --- a/kernel/printk/printk_safe.c +++ b/kernel/printk/printk_safe.c @@ -74,15 +74,6 @@ asmlinkage int vprintk(const char *fmt, va_list args) if (unlikely(kdb_trap_printk && kdb_printf_cpu < 0)) return vkdb_printf(KDB_MSGSRC_PRINTK, fmt, args); #endif - - /* - * Use the main logbuf even in NMI. But avoid calling console - * drivers that might have their own locks. - */ - if (is_printk_legacy_deferred()) - return vprintk_deferred(fmt, args); - - /* No obstacles. */ return vprintk_default(fmt, args); } EXPORT_SYMBOL(vprintk);