From: Martin Hundebøll <martin@xxxxxxxxxx> Outside prinkt users might wan't assure whatever printed has reached its destination before continuing. E.g. during the shutdown-procedure, where printk-buffers aren't emptied before the system goes down. Signed-off-by: Martin Hundebøll <martin@xxxxxxxxxx> --- include/linux/printk.h | 2 ++ kernel/printk/printk.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/linux/printk.h b/include/linux/printk.h index a2d40a637226..c8ac0f17d828 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -142,6 +142,8 @@ void early_printk(const char *s, ...) { } struct dev_printk_info; +bool pr_flush(int timeout_ms, bool reset_on_progress); + #ifdef CONFIG_PRINTK asmlinkage __printf(4, 0) int vprintk_emit(int facility, int level, diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index e29f77f4f8b4..26a63457ba6c 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2484,7 +2484,6 @@ asmlinkage __visible int _printk(const char *fmt, ...) } EXPORT_SYMBOL(_printk); -static bool pr_flush(int timeout_ms, bool reset_on_progress); static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progress); static struct task_struct *nbcon_legacy_kthread; @@ -2505,7 +2504,7 @@ static inline void wake_up_legacy_kthread(void) static u64 syslog_seq; -static bool pr_flush(int timeout_ms, bool reset_on_progress) { return true; } +bool pr_flush(int timeout_ms, bool reset_on_progress) { return true; } static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progress) { return true; } static inline void nbcon_legacy_kthread_create(void) { } @@ -4217,7 +4216,7 @@ static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progre * Context: Process context. May sleep while acquiring console lock. * Return: true if all usable printers are caught up. */ -static bool pr_flush(int timeout_ms, bool reset_on_progress) +bool pr_flush(int timeout_ms, bool reset_on_progress) { return __pr_flush(NULL, timeout_ms, reset_on_progress); } -- 2.44.0