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
6#include <linux/preempt.h>6#include <linux/preempt.h>
7#include <linux/smp.h>7#include <linux/smp.h>
8#include <linux/cpumask.h>8#include <linux/cpumask.h>
9#include <linux/printk.h>
10#include <linux/pfn.h>9#include <linux/pfn.h>
11#include <linux/init.h>10#include <linux/init.h>
12 11
include/linux/printk.h+4−0
@@ -198,6 +198,7 @@ void dump_stack_print_info(const char *log_lvl); · 197 unmodified lines
198void show_regs_print_info(const char *log_lvl);198void show_regs_print_info(const char *log_lvl);
199extern asmlinkage void dump_stack_lvl(const char *log_lvl) __cold;199extern asmlinkage void dump_stack_lvl(const char *log_lvl) __cold;
200extern asmlinkage void dump_stack(void) __cold;200extern asmlinkage void dump_stack(void) __cold;
201void printk_trigger_flush(void);
201#else202#else
202static inline __printf(1, 0)203static inline __printf(1, 0)
203int vprintk(const char *s, va_list args)204int vprintk(const char *s, va_list args)
@@ -274,6 +275,9 @@ static inline void dump_stack_lvl(const char *log_lvl) · 70 unmodified lines
274static inline void dump_stack(void)275static inline void dump_stack(void)
275{276{
276}277}
278static inline void printk_trigger_flush(void)
279{
280}
277#endif281#endif
278 282
279#ifdef CONFIG_SMP283#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