diff options
author | Linus Torvalds | 2024-07-25 13:18:41 -0700 |
---|---|---|
committer | Linus Torvalds | 2024-07-25 13:18:41 -0700 |
commit | 8bf100092d60bf586bbc1a3a2cd833bb212d9d53 (patch) | |
tree | 009a9a5ba35f87835b3526d3cb9f40060e588fe1 /drivers | |
parent | b485625078cab3b824a84ce185b6e73733704b5b (diff) | |
parent | a930fde94ae5fbcb178c1330268f15f2c893c507 (diff) |
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 'drivers')
-rw-r--r-- | drivers/tty/sysrq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index e5974b8239c9..53f8c2329c30 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -452,7 +452,7 @@ static const struct sysrq_key_op sysrq_unrt_op = { static void sysrq_handle_replay_logs(u8 key) { - console_replay_all(); + console_try_replay_all(); } static struct sysrq_key_op sysrq_replay_logs_op = { .handler = sysrq_handle_replay_logs, |