mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-31 14:41:10 +00:00
38 lines
1.0 KiB
Diff
38 lines
1.0 KiB
Diff
From: John Ogness <john.ogness@linutronix.de>
|
|
Date: Mon, 30 Nov 2020 01:42:04 +0106
|
|
Subject: [PATCH 22/28] printk: combine boot_delay_msec() into printk_delay()
|
|
|
|
boot_delay_msec() is always called immediately before printk_delay()
|
|
so just combine the two.
|
|
|
|
Signed-off-by: John Ogness <john.ogness@linutronix.de>
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
kernel/printk/printk.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
--- a/kernel/printk/printk.c
|
|
+++ b/kernel/printk/printk.c
|
|
@@ -1727,8 +1727,10 @@ SYSCALL_DEFINE3(syslog, int, type, char
|
|
|
|
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;
|
|
|
|
@@ -2186,8 +2188,7 @@ asmlinkage int vprintk_emit(int facility
|
|
in_sched = true;
|
|
}
|
|
|
|
- boot_delay_msec(level);
|
|
- printk_delay();
|
|
+ printk_delay(level);
|
|
|
|
printed_len = vprintk_store(facility, level, dev_info, fmt, args);
|
|
|