diff options
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.patch | 10 |
1 files changed, 5 insertions, 5 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 index 64dda79fa..dea05046d 100644 --- 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 @@ -1,8 +1,8 @@ -From 17a9ff9877863dc267a2b0ead2ab3f792b5e405c Mon Sep 17 00:00:00 2001 +From 9d005857069eb51e552200c4cd458a06b0259d52 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 +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz boot_delay_msec() is always called immediately before printk_delay() so just combine the two. @@ -14,7 +14,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c -index c3fc6706a118..0ae184675e86 100644 +index b25a17947ae90..d7f17b8253cdc 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) @@ -29,7 +29,7 @@ index c3fc6706a118..0ae184675e86 100644 if (unlikely(printk_delay_msec)) { int m = printk_delay_msec; -@@ -2189,8 +2191,7 @@ asmlinkage int vprintk_emit(int facility, int level, +@@ -2195,8 +2197,7 @@ asmlinkage int vprintk_emit(int facility, int level, in_sched = true; } @@ -40,5 +40,5 @@ index c3fc6706a118..0ae184675e86 100644 printed_len = vprintk_store(facility, level, dev_info, fmt, args); -- -2.43.0 +2.44.0 |