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 /kernel | |
| parent | Merge tag 'constfy-sysctl-6.11-rc1' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | vsprintf: add missing MODULE_DESCRIPTION() macro (diff) | |
| download | linux-8bf100092d60bf586bbc1a3a2cd833bb212d9d53.tar.gz linux-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 'kernel')
| -rw-r--r-- | kernel/printk/printk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 9ab3a39b4c11..054c0e7784fd 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -4372,15 +4372,15 @@ void kmsg_dump_rewind(struct kmsg_dump_iter *iter) EXPORT_SYMBOL_GPL(kmsg_dump_rewind); /** - * console_replay_all - replay kernel log on consoles + * console_try_replay_all - try to replay kernel log on consoles * * Try to obtain lock on console subsystem and replay all * available records in printk buffer on the consoles. * Does nothing if lock is not obtained. * - * Context: Any context. + * Context: Any, except for NMI. */ -void console_replay_all(void) +void console_try_replay_all(void) { if (console_trylock()) { __console_rewind_all(); |