diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-17 22:57:42 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-17 22:57:42 +0300 |
| commit | 93d17c1c8c1cc987aad378d5266d99e46efca43c (patch) | |
| tree | a8cffc099e31bbdc254a492df2a3ff18445299de /include | |
| parent | ef06e68290b2b1b674950da276d6f7724e0b9874 (diff) | |
| parent | 38335cc5ffafa111210ad6bbe5a63a87db38ee68 (diff) | |
| download | linux-93d17c1c8c1cc987aad378d5266d99e46efca43c.tar.xz | |
Merge tag 'printk-for-5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux
Pull printk fixes from Petr Mladek:
"Make the global console_sem available for CPU that is handling panic()
or shutdown.
This is an old problem when an existing console lock owner might block
console output, but it became more visible with the kthreads"
* tag 'printk-for-5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
printk: Wait for the global console lock when the system is going down
printk: Block console kthreads when direct printing will be required
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/printk.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/printk.h b/include/linux/printk.h index 10ec29bc0135..f88ec15f83dc 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -173,6 +173,7 @@ extern void printk_prefer_direct_enter(void); extern void printk_prefer_direct_exit(void); extern bool pr_flush(int timeout_ms, bool reset_on_progress); +extern void try_block_console_kthreads(int timeout_ms); /* * Please don't use printk_ratelimit(), because it shares ratelimiting state @@ -237,6 +238,10 @@ static inline bool pr_flush(int timeout_ms, bool reset_on_progress) return true; } +static inline void try_block_console_kthreads(int timeout_ms) +{ +} + static inline int printk_ratelimit(void) { return 0; |