VisionFive2 Linux kernel

StarFive Tech Linux Kernel for VisionFive (JH7110) boards (mirror)

More than 9999 Commits   30 Branches   50 Tags
author: John Ogness <john.ogness@linutronix.de> 2020-11-30 01:42:04 +0106 committer: Minda Chen <minda.chen@starfivetech.com> 2023-11-06 19:24:37 +0800 commit: 458c1a4e0b71a9be650e97155e8b73a3e6e47174 parent: 0685e84413745c7fbc0c71893102d0acf67a1a96
Commit Summary:
printk: call boot_delay_msec() in printk_delay()
Diffstat:
1 file changed, 4 insertions, 3 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 1b1236e0f3ba..972842eb642a 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1750,8 +1750,10 @@ SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
 
 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;
 
@@ -2223,8 +2225,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);