diff options
Diffstat (limited to 'features/rt/printk-combine-boot_delay_msec-into-printk_delay.patch')
-rw-r--r-- | features/rt/printk-combine-boot_delay_msec-into-printk_delay.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/features/rt/printk-combine-boot_delay_msec-into-printk_delay.patch b/features/rt/printk-combine-boot_delay_msec-into-printk_delay.patch new file mode 100644 index 00000000..727ce601 --- /dev/null +++ b/features/rt/printk-combine-boot_delay_msec-into-printk_delay.patch @@ -0,0 +1,43 @@ +From e26bd5bb048a90ae9dbb91191947709c0bfd7050 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 027/191] 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(-) + +diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c +index 84fae4f08634..2b13deb971b9 100644 +--- a/kernel/printk/printk.c ++++ b/kernel/printk/printk.c +@@ -1727,8 +1727,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; + +@@ -2186,8 +2188,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.19.1 + |