Commit e8f6fbf6 authored by Ingo Molnar's avatar Ingo Molnar Committed by David S. Miller
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1fa989e8

include/linux/lockdep.h

+3 −2
Original line number Diff line number Diff line
@@ -331,10 +331,11 @@ static inline void lockdep_on(void) 
# define lock_set_subclass(l, s, i)		do { } while (0)

# define lockdep_init()				do { } while (0)

# define lockdep_info()				do { } while (0)

# define lockdep_init_map(lock, name, key, sub)	do { (void)(key); } while (0)

# define lockdep_init_map(lock, name, key, sub) \

		do { (void)(name); (void)(key); } while (0)

# define lockdep_set_class(lock, key)		do { (void)(key); } while (0)

# define lockdep_set_class_and_name(lock, key, name) \

		do { (void)(key); } while (0)

		do { (void)(key); (void)(name); } while (0)

#define lockdep_set_class_and_subclass(lock, key, sub) \

		do { (void)(key); } while (0)

#define lockdep_set_subclass(lock, sub)		do { } while (0)

net/core/sock.c

+0 −2
Original line number Diff line number Diff line
@@ -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,

include/net/sock.h

+1 −1

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE