diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-18 19:50:45 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-18 19:50:45 +0100 |
commit | 7d5775d49e4a488bc8a07e5abb2b71a4c28aadbb (patch) | |
tree | dc93689f2ece8f213e223951f75aada9d86c6be6 /kernel | |
parent | Merge tag 'gfs2-v5.16-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
parent | Merge branch 'rework/printk_safe-removal' into for-linus (diff) | |
download | linux-7d5775d49e4a488bc8a07e5abb2b71a4c28aadbb.tar.xz linux-7d5775d49e4a488bc8a07e5abb2b71a4c28aadbb.zip |
Merge tag 'printk-for-5.16-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux
Pull printk fixes from Petr Mladek:
- Try to flush backtraces from other CPUs also on the local one. This
was a regression caused by printk_safe buffers removal.
- Remove header dependency warning.
* tag 'printk-for-5.16-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
printk: Remove printk.h inclusion in percpu.h
printk: restore flushing of NMI buffers on remote CPUs after NMI backtraces
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/printk/printk.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 013bfd6dcc34..57b132b658e1 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -3253,6 +3253,11 @@ void defer_console_output(void) preempt_enable(); } +void printk_trigger_flush(void) +{ + defer_console_output(); +} + int vprintk_deferred(const char *fmt, va_list args) { int r; |