From: Linus Torvalds Date: Mon, 4 Sep 2023 20:20:19 +0000 (-0700) Subject: Merge tag 'printk-for-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/printk... X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3c31041e37324e143bee98604bb31481e905b4b3;p=users%2Fwilly%2Fpagecache.git Merge tag 'printk-for-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux Pull printk updates from Petr Mladek: - Do not try to get the console lock when it is not need or useful in panic() - Replace the global console_suspended state by a per-console flag - Export symbols needed for dumping the raw printk buffer in panic() - Fix documentation of printf formats for integer types - Moved Sergey Senozhatsky to the reviewer role - Misc cleanups * tag 'printk-for-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux: printk: export symbols for debug modules lib: test_scanf: Add explicit type cast to result initialization in test_number_prefix() printk: ringbuffer: Fix truncating buffer size min_t cast printk: Rename abandon_console_lock_in_panic() to other_cpu_in_panic() printk: Add per-console suspended state printk: Consolidate console deferred printing printk: Do not take console lock for console_flush_on_panic() printk: Keep non-panic-CPUs out of console lock printk: Reduce console_unblank() usage in unsafe scenarios kdb: Do not assume write() callback available docs: printk-formats: Treat char as always unsigned docs: printk-formats: Fix hex printing of signed values MAINTAINERS: adjust printk/vsprintf entries --- 3c31041e37324e143bee98604bb31481e905b4b3 diff --cc kernel/printk/printk.c index 357a4d18f6387,1524893aebedb..96fc38cb2e841 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@@ -88,10 -86,10 +88,10 @@@ EXPORT_SYMBOL(oops_in_progress) static DEFINE_MUTEX(console_mutex); /* - * console_sem protects updates to console->seq and console_suspended, + * console_sem protects updates to console->seq * and also provides serialization for console printing. */ -static DEFINE_SEMAPHORE(console_sem); +static DEFINE_SEMAPHORE(console_sem, 1); HLIST_HEAD(console_list); EXPORT_SYMBOL_GPL(console_list); DEFINE_STATIC_SRCU(console_srcu);