diff options
author | Jonathan Corbet <corbet@lwn.net> | 2021-12-10 23:57:09 +0300 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2021-12-10 23:57:09 +0300 |
commit | a7fb920b158da0a154da609a4c27ff693404ec90 (patch) | |
tree | 0637688614d7889aef9dd76870b9605d3f563247 /include/linux/printk.h | |
parent | ce881fc06dc87e73928ced4c37b6ac6b32ef5fb6 (diff) | |
parent | 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 (diff) | |
download | linux-a7fb920b158da0a154da609a4c27ff693404ec90.tar.xz |
Merge tag 'v5.16-rc4' into docs-next
I have a couple of fixes for warnings introduced after -rc1; catch up to
-rc4 so that the fixes have something to fix.
Diffstat (limited to 'include/linux/printk.h')
-rw-r--r-- | include/linux/printk.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/printk.h b/include/linux/printk.h index 85b656f82d75..9497f6b98339 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -198,6 +198,7 @@ void dump_stack_print_info(const char *log_lvl); void show_regs_print_info(const char *log_lvl); extern asmlinkage void dump_stack_lvl(const char *log_lvl) __cold; extern asmlinkage void dump_stack(void) __cold; +void printk_trigger_flush(void); #else static inline __printf(1, 0) int vprintk(const char *s, va_list args) @@ -274,6 +275,9 @@ static inline void dump_stack_lvl(const char *log_lvl) static inline void dump_stack(void) { } +static inline void printk_trigger_flush(void) +{ +} #endif #ifdef CONFIG_SMP |