diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-25 13:18:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-25 13:18:41 -0700 |
| commit | 8bf100092d60bf586bbc1a3a2cd833bb212d9d53 (patch) | |
| tree | 009a9a5ba35f87835b3526d3cb9f40060e588fe1 /include | |
| parent | b485625078cab3b824a84ce185b6e73733704b5b (diff) | |
| parent | a930fde94ae5fbcb178c1330268f15f2c893c507 (diff) | |
| download | lwn-8bf100092d60bf586bbc1a3a2cd833bb212d9d53.tar.gz lwn-8bf100092d60bf586bbc1a3a2cd833bb212d9d53.zip | |
Merge tag 'printk-for-6.11-trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux
Pull printk updates from Petr Mladek:
- trivial printk changes
The bigger "real" printk work is still being discussed.
* tag 'printk-for-6.11-trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
vsprintf: add missing MODULE_DESCRIPTION() macro
printk: Rename console_replay_all() and update context
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/printk.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/printk.h b/include/linux/printk.h index 7239976698e4..b937cefcb31c 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -196,7 +196,7 @@ 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); -void console_replay_all(void); +void console_try_replay_all(void); #else static inline __printf(1, 0) int vprintk(const char *s, va_list args) @@ -276,7 +276,7 @@ static inline void dump_stack(void) static inline void printk_trigger_flush(void) { } -static inline void console_replay_all(void) +static inline void console_try_replay_all(void) { } #endif |