Commit 1f47e8af authored by John Ogness's avatar John Ogness Committed by Petr Mladek
Browse files

printk: call boot_delay_msec() in printk_delay() 



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

Signed-off-by: default avatarJohn Ogness <john.ogness@linutronix.de>
Reviewed-by: default avatarSergey Senozhatsky <senozhatsky@chromium.org>
Reviewed-by: default avatarPetr Mladek <pmladek@suse.com>
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20220421212250.565456-8-john.ogness@linutronix.de
parent 9f0844de

kernel/printk/printk.c

+4 −3
Original line number Diff line number Diff line
@@ -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);