summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0102-printk-combine-boot_delay_msec-into-printk_delay.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0102-printk-combine-boot_delay_msec-into-printk_delay.patch')
-rw-r--r--debian/patches-rt/0102-printk-combine-boot_delay_msec-into-printk_delay.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/debian/patches-rt/0102-printk-combine-boot_delay_msec-into-printk_delay.patch b/debian/patches-rt/0102-printk-combine-boot_delay_msec-into-printk_delay.patch
new file mode 100644
index 000000000..64dda79fa
--- /dev/null
+++ b/debian/patches-rt/0102-printk-combine-boot_delay_msec-into-printk_delay.patch
@@ -0,0 +1,44 @@
+From 17a9ff9877863dc267a2b0ead2ab3f792b5e405c Mon Sep 17 00:00:00 2001
+From: John Ogness <john.ogness@linutronix.de>
+Date: Mon, 30 Nov 2020 01:42:04 +0106
+Subject: [PATCH 102/323] printk: combine boot_delay_msec() into printk_delay()
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz
+
+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(-)
+
+diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
+index c3fc6706a118..0ae184675e86 100644
+--- a/kernel/printk/printk.c
++++ b/kernel/printk/printk.c
+@@ -1730,8 +1730,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;
+
+@@ -2189,8 +2191,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.43.0
+