Commit 6d48b791 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Ingo Molnar

lockdep: Address clang -Wformat warning printing for %hd

Clang doesn't like format strings that truncate a 32-bit
value to something shorter:

  kernel/locking/lockdep.c:709:4: error: format specifies type 'short' but the argument has type 'int' [-Werror,-Wformat]

In this case, the warning is a slightly questionable, as it could realize
that both class->wait_type_outer and class->wait_type_inner are in fact
8-bit struct members, even though the result of the ?: operator becomes an
'int'.

However, there is really no point in printing the number as a 16-bit
'short' rather than either an 8-bit or 32-bit number, so just change
it to a normal %d.

Fixes: de8f5e4f ("lockdep: Introduce wait-type checks")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210322115531.3987555-1-arnd@kernel.org
parent 3a85969e
...@@ -705,7 +705,7 @@ static void print_lock_name(struct lock_class *class) ...@@ -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);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment