archives/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-03-08 03:24:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

printk: Move locking annotation to printk.c

Browse source 
With Sparse support gone, Clang is a bit more strict and warns:

./include/linux/console.h:492:50: error: use of undeclared identifier 'console_mutex'
  492 | extern void console_list_unlock(void) __releases(console_mutex);

Since it does not make sense to make console_mutex itself global, move
the annotation to printk.c. Context analysis remains disabled for
printk.c.

This is needed to enable context analysis for modules that include
<linux/console.h>.

Signed-off-by: Marco Elver <elver@google.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://patch.msgid.link/20251219154418.3592607-34-elver@google.com
This commit is contained in:
Marco Elver 2025-12-19 16:40:22 +01:00 • committed by Peter Zijlstra
parent 322366b8f1
commit 8ec56d9aab
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/console.h
View file

@ -492,8 +492,8 @@ static inline bool console_srcu_read_lock_is_held(void)
extern int console_srcu_read_lock(void);
extern void console_srcu_read_unlock(int cookie);
extern void console_list_lock(void) __acquires(console_mutex);
extern void console_list_unlock(void) __releases(console_mutex);
extern void console_list_lock(void);
extern void console_list_unlock(void);
extern struct hlist_head console_list;

2
kernel/printk/printk.c
View file

@ -245,6 +245,7 @@ int devkmsg_sysctl_set_loglvl(const struct ctl_table *table, int write,
* For console list or console->flags updates
*/
void console_list_lock(void)
__acquires(&console_mutex)
{
/*
* In unregister_console() and console_force_preferred_locked(),
@ -269,6 +270,7 @@ EXPORT_SYMBOL(console_list_lock);
* Counterpart to console_list_lock()
*/
void console_list_unlock(void)
__releases(&console_mutex)
{
mutex_unlock(&console_mutex);
}