moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'locking-urgent-2021-04-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
Pull locking fixlets from Ingo Molnar:
 "Two minor fixes: one for a Clang warning, the other improves an
  ambiguous/confusing kernel log message"

* tag 'locking-urgent-2021-04-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  lockdep: Address clang -Wformat warning printing for %hd
  lockdep: Add a missing initialization hint to the "INFO: Trying to register non-static key" message
This commit is contained in:
Linus Torvalds
2021-04-11 11:47:03 -07:00
parent 06f838e02d 6d48b7912c
commit add6b92660
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/locking/lockdep.c
View File

@@ -705,7 +705,7 @@ static void print_lock_name(struct lock_class *class)
printk(KERN_CONT " ("); printk(KERN_CONT " (");
__print_lock_name(class); __print_lock_name(class);
printk(KERN_CONT "){%s}-{%hd:%hd}", usage, printk(KERN_CONT "){%s}-{%d:%d}", usage,
class->wait_type_outer ?: class->wait_type_inner, class->wait_type_outer ?: class->wait_type_inner,
class->wait_type_inner); class->wait_type_inner);
} }
@@ -930,7 +930,8 @@ static bool assign_lock_key(struct lockdep_map *lock)
/* Debug-check: all keys must be persistent! */ /* Debug-check: all keys must be persistent! */
debug_locks_off(); debug_locks_off();
pr_err("INFO: trying to register non-static key.\n"); pr_err("INFO: trying to register non-static key.\n");
pr_err("the code is fine but needs lockdep annotation.\n"); pr_err("The code is fine but needs lockdep annotation, or maybe\n");
pr_err("you didn't initialize this object before use?\n");
pr_err("turning off the locking correctness validator.\n"); pr_err("turning off the locking correctness validator.\n");
dump_stack(); dump_stack();
return false; return false;