diff options
Diffstat (limited to 'debian/patches-rt/0014-printk-do-boot_delay_msec-inside-printk_delay.patch')
| -rw-r--r-- | debian/patches-rt/0014-printk-do-boot_delay_msec-inside-printk_delay.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-rt/0014-printk-do-boot_delay_msec-inside-printk_delay.patch b/debian/patches-rt/0014-printk-do-boot_delay_msec-inside-printk_delay.patch index f1aabfa37..a47557e32 100644 --- a/debian/patches-rt/0014-printk-do-boot_delay_msec-inside-printk_delay.patch +++ b/debian/patches-rt/0014-printk-do-boot_delay_msec-inside-printk_delay.patch @@ -1,7 +1,7 @@ From: John Ogness <john.ogness@linutronix.de> Date: Tue, 12 Feb 2019 15:29:52 +0100 Subject: [PATCH 14/25] printk: do boot_delay_msec inside printk_delay -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.2/older/patches-5.2.17-rt9.tar.xz +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patches-5.4.3-rt1.tar.xz Both functions needed to be called one after the other, so just integrate boot_delay_msec into printk_delay for simplification. @@ -14,7 +14,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c -@@ -1497,6 +1497,21 @@ SYSCALL_DEFINE3(syslog, int, type, char +@@ -1507,6 +1507,21 @@ SYSCALL_DEFINE3(syslog, int, type, char return do_syslog(type, buf, len, SYSLOG_FROM_READER); } @@ -36,7 +36,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> static void print_console_dropped(struct console *con, u64 count) { char text[64]; -@@ -1578,20 +1593,6 @@ static void call_console_drivers(u64 seq +@@ -1588,20 +1603,6 @@ static void call_console_drivers(u64 seq } } @@ -57,7 +57,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> static inline u32 printk_caller_id(void) { return in_task() ? task_pid_nr(current) : -@@ -2565,10 +2566,8 @@ static int printk_kthread_func(void *dat +@@ -2575,10 +2576,8 @@ static int printk_kthread_func(void *dat console_lock(); call_console_drivers(master_seq, ext_text, ext_len, text, len); |