History

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

Linus Torvalds committed 4 years ago

Commit 7d5775d2 parents 42eb8fd bf6d0d15 files · +21 −1Browse files

Showing the changes to include (2 of 5 files). Show all

Unified · Split

2 files
  1. include/linux/percpu.h +0 −1
  2. include/linux/printk.h +4 −0
include/linux/percpu.h+0−1
@@ -6,7 +6,6 @@ · 5 unmodified lines
66 #include <linux/preempt.h>
77 #include <linux/smp.h>
88 #include <linux/cpumask.h>
9−#include <linux/printk.h>
109 #include <linux/pfn.h>
1110 #include <linux/init.h>
1211
include/linux/printk.h+4−0
@@ -198,6 +198,7 @@ void dump_stack_print_info(const char *log_lvl); · 197 unmodified lines
198198 void show_regs_print_info(const char *log_lvl);
199199 extern asmlinkage void dump_stack_lvl(const char *log_lvl) __cold;
200200 extern asmlinkage void dump_stack(void) __cold;
201+void printk_trigger_flush(void);
201202 #else
202203 static inline __printf(1, 0)
203204 int vprintk(const char *s, va_list args)
@@ -274,6 +275,9 @@ static inline void dump_stack_lvl(const char *log_lvl) · 70 unmodified lines
274275 static inline void dump_stack(void)
275276 {
276277 }
278+static inline void printk_trigger_flush(void)
279+{
280+}
277281 #endif
278282
279283 #ifdef CONFIG_SMP

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t