Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 05:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

printk: call boot_delay_msec() in printk_delay()

Browse Source 
boot_delay_msec() is always called immediately before printk_delay()
so just call it from within printk_delay().

Signed-off-by: John Ogness <john.ogness@linutronix.de>
Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20220421212250.565456-8-john.ogness@linutronix.de
This commit is contained in:
John Ogness 2022-04-21 23:28:42 +02:06 committed by Petr Mladek
parent 9f0844de49
commit 1f47e8af45
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/printk/printk.c
View File

@ -2048,8 +2048,10 @@ static u8 *__printk_recursion_counter(void)
int printk_delay_msec __read_mostly;
static inline void printk_delay(void)
static inline void printk_delay(int level)
{
boot_delay_msec(level);
if (unlikely(printk_delay_msec)) {
int m = printk_delay_msec;
@ -2274,8 +2276,7 @@ asmlinkage int vprintk_emit(int facility, int level,
in_sched = true;
}
boot_delay_msec(level);
printk_delay();
printk_delay(level);
printed_len = vprintk_store(facility, level, dev_info, fmt, args);