diff options
Diffstat (limited to 'debian/patches-rt/printk__relocate_printk_delay.patch')
| -rw-r--r-- | debian/patches-rt/printk__relocate_printk_delay.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/debian/patches-rt/printk__relocate_printk_delay.patch b/debian/patches-rt/printk__relocate_printk_delay.patch new file mode 100644 index 000000000..b2209d31b --- /dev/null +++ b/debian/patches-rt/printk__relocate_printk_delay.patch @@ -0,0 +1,62 @@ +Subject: printk: relocate printk_delay() +From: John Ogness <john.ogness@linutronix.de> +Date: Mon Nov 30 01:42:03 2020 +0106 +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/older/patches-5.15.3-rt21.tar.xz + +From: John Ogness <john.ogness@linutronix.de> + +Move printk_delay() "as is" further up so that they can be used by +new functions in an upcoming commit. + +Signed-off-by: John Ogness <john.ogness@linutronix.de> +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +Signed-off-by: Thomas Gleixner <tglx@linutronix.de> + +--- + kernel/printk/printk.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) +--- +--- a/kernel/printk/printk.c ++++ b/kernel/printk/printk.c +@@ -1748,6 +1748,20 @@ SYSCALL_DEFINE3(syslog, int, type, char + return do_syslog(type, buf, len, SYSLOG_FROM_READER); + } + ++int printk_delay_msec __read_mostly; ++ ++static inline void printk_delay(void) ++{ ++ if (unlikely(printk_delay_msec)) { ++ int m = printk_delay_msec; ++ ++ while (m--) { ++ mdelay(1); ++ touch_nmi_watchdog(); ++ } ++ } ++} ++ + /* + * Special console_lock variants that help to reduce the risk of soft-lockups. + * They allow to pass console_lock to another printk() call using a busy wait. +@@ -2002,20 +2016,6 @@ static u8 *__printk_recursion_counter(vo + local_irq_restore(flags); \ + } while (0) + +-int printk_delay_msec __read_mostly; +- +-static inline void printk_delay(void) +-{ +- if (unlikely(printk_delay_msec)) { +- int m = printk_delay_msec; +- +- while (m--) { +- mdelay(1); +- touch_nmi_watchdog(); +- } +- } +-} +- + static inline u32 printk_caller_id(void) + { + return in_task() ? task_pid_nr(current) : |