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

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

Changed files
+3 -2
kernel
locking
+3 -2
kernel/locking/lockdep.c
··· 705 705 706 706 printk(KERN_CONT " ("); 707 707 __print_lock_name(class); 708 - printk(KERN_CONT "){%s}-{%hd:%hd}", usage, 708 + printk(KERN_CONT "){%s}-{%d:%d}", usage, 709 709 class->wait_type_outer ?: class->wait_type_inner, 710 710 class->wait_type_inner); 711 711 } ··· 930 930 /* Debug-check: all keys must be persistent! */ 931 931 debug_locks_off(); 932 932 pr_err("INFO: trying to register non-static key.\n"); 933 - pr_err("the code is fine but needs lockdep annotation.\n"); 933 + pr_err("The code is fine but needs lockdep annotation, or maybe\n"); 934 + pr_err("you didn't initialize this object before use?\n"); 934 935 pr_err("turning off the locking correctness validator.\n"); 935 936 dump_stack(); 936 937 return false;