diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-12 01:38:36 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-13 23:19:10 -0800 |
| commit | e8f6fbf62de37cbc2e179176ac7010d5f4396b67 (patch) | |
| tree | ac22d719c3c93d24b7eeda395b3271be60bfc661 /net | |
| parent | 1fa989e80a9a104bf3b81842a5f4c1867d7aa9c4 (diff) | |
| download | linux-3.10-e8f6fbf62de37cbc2e179176ac7010d5f4396b67.tar.gz linux-3.10-e8f6fbf62de37cbc2e179176ac7010d5f4396b67.tar.bz2 linux-3.10-e8f6fbf62de37cbc2e179176ac7010d5f4396b67.zip | |
lockdep: include/linux/lockdep.h - fix warning in net/bluetooth/af_bluetooth.c
fix this warning:
net/bluetooth/af_bluetooth.c:60: warning: ‘bt_key_strings’ defined but not used
net/bluetooth/af_bluetooth.c:71: warning: ‘bt_slock_key_strings’ defined but not used
this is a lockdep macro problem in the !LOCKDEP case.
We cannot convert it to an inline because the macro works on multiple types,
but we can mark the parameter used.
[ also clean up a misaligned tab in sock_lock_init_class_and_name() ]
[ also remove #ifdefs from around af_family_clock_key strings - which
were certainly added to get rid of the ugly build warnings. ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/sock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 5e2a3132a8c..341e3945695 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -136,7 +136,6 @@ static struct lock_class_key af_family_keys[AF_MAX]; static struct lock_class_key af_family_slock_keys[AF_MAX]; -#ifdef CONFIG_DEBUG_LOCK_ALLOC /* * Make lock validator output more readable. (we pre-construct these * strings build-time, so that runtime initialization of socket @@ -187,7 +186,6 @@ static const char *af_family_clock_key_strings[AF_MAX+1] = { "clock-AF_RXRPC" , "clock-AF_ISDN" , "clock-AF_PHONET" , "clock-AF_MAX" }; -#endif /* * sk_callback_lock locking rules are per-address-family, |