tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 8bf10009 b4856250

+8 -6
+1 -1
drivers/tty/sysrq.c
··· 452 452 453 453 static void sysrq_handle_replay_logs(u8 key) 454 454 { 455 - console_replay_all(); 455 + console_try_replay_all(); 456 456 } 457 457 static struct sysrq_key_op sysrq_replay_logs_op = { 458 458 .handler = sysrq_handle_replay_logs,
+2 -2
include/linux/printk.h
··· 196 196 extern asmlinkage void dump_stack_lvl(const char *log_lvl) __cold; 197 197 extern asmlinkage void dump_stack(void) __cold; 198 198 void printk_trigger_flush(void); 199 - void console_replay_all(void); 199 + void console_try_replay_all(void); 200 200 #else 201 201 static inline __printf(1, 0) 202 202 int vprintk(const char *s, va_list args) ··· 276 276 static inline void printk_trigger_flush(void) 277 277 { 278 278 } 279 - static inline void console_replay_all(void) 279 + static inline void console_try_replay_all(void) 280 280 { 281 281 } 282 282 #endif
+3 -3
kernel/printk/printk.c
··· 4372 4372 EXPORT_SYMBOL_GPL(kmsg_dump_rewind); 4373 4373 4374 4374 /** 4375 - * console_replay_all - replay kernel log on consoles 4375 + * console_try_replay_all - try to replay kernel log on consoles 4376 4376 * 4377 4377 * Try to obtain lock on console subsystem and replay all 4378 4378 * available records in printk buffer on the consoles. 4379 4379 * Does nothing if lock is not obtained. 4380 4380 * 4381 - * Context: Any context. 4381 + * Context: Any, except for NMI. 4382 4382 */ 4383 - void console_replay_all(void) 4383 + void console_try_replay_all(void) 4384 4384 { 4385 4385 if (console_trylock()) { 4386 4386 __console_rewind_all();
+1
lib/test_printf.c
··· 824 824 825 825 KSTM_MODULE_LOADERS(test_printf); 826 826 MODULE_AUTHOR("Rasmus Villemoes <linux@rasmusvillemoes.dk>"); 827 + MODULE_DESCRIPTION("Test cases for printf facility"); 827 828 MODULE_LICENSE("GPL");
+1
lib/test_scanf.c
··· 810 810 811 811 KSTM_MODULE_LOADERS(test_scanf); 812 812 MODULE_AUTHOR("Richard Fitzgerald <rf@opensource.cirrus.com>"); 813 + MODULE_DESCRIPTION("Test cases for sscanf facility"); 813 814 MODULE_LICENSE("GPL v2");