| From | John Ogness <> | Subject | [PATCH printk v1 05/13] printk: call boot_delay_msec() in printk_delay() | Date | Mon, 7 Feb 2022 20:49:15 +0106 |
| |
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> --- kernel/printk/printk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 206405f349d0..8c9a89c60989 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2002,8 +2002,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; @@ -2224,8 +2226,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); -- 2.30.2
|