| From a338f84dc196f44b63ba0863d2f34fd9b1613572 Mon Sep 17 00:00:00 2001 |
| From: Petr Mladek <pmladek@suse.com> |
| Date: Wed, 27 Jun 2018 16:08:16 +0200 |
| Subject: printk: Create helper function to queue deferred console handling |
| |
| From: Petr Mladek <pmladek@suse.com> |
| |
| commit a338f84dc196f44b63ba0863d2f34fd9b1613572 upstream. |
| |
| It is just a preparation step. The patch does not change |
| the existing behavior. |
| |
| Link: http://lkml.kernel.org/r/20180627140817.27764-3-pmladek@suse.com |
| To: Steven Rostedt <rostedt@goodmis.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> |
| Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> |
| Cc: linux-kernel@vger.kernel.org |
| Cc: stable@vger.kernel.org |
| Acked-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> |
| Signed-off-by: Petr Mladek <pmladek@suse.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| kernel/printk/printk.c | 14 +++++++++----- |
| 1 file changed, 9 insertions(+), 5 deletions(-) |
| |
| --- a/kernel/printk/printk.c |
| +++ b/kernel/printk/printk.c |
| @@ -2723,16 +2723,20 @@ void wake_up_klogd(void) |
| preempt_enable(); |
| } |
| |
| -int vprintk_deferred(const char *fmt, va_list args) |
| +void defer_console_output(void) |
| { |
| - int r; |
| - |
| - r = vprintk_emit(0, LOGLEVEL_SCHED, NULL, 0, fmt, args); |
| - |
| preempt_disable(); |
| __this_cpu_or(printk_pending, PRINTK_PENDING_OUTPUT); |
| irq_work_queue(this_cpu_ptr(&wake_up_klogd_work)); |
| preempt_enable(); |
| +} |
| + |
| +int vprintk_deferred(const char *fmt, va_list args) |
| +{ |
| + int r; |
| + |
| + r = vprintk_emit(0, LOGLEVEL_SCHED, NULL, 0, fmt, args); |
| + defer_console_output(); |
| |
| return r; |
| } |