iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: Fix build failure due to lockdep_sock_is_held().

Browse Source 
Needs to be protected with CONFIG_LOCKDEP.

Based upon a patch by Hannes Frederic Sowa.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2016-04-07 20:40:25 -04:00
parent 03be98226c
commit b33b0a1bf6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/sock.h
View File

@ -1360,6 +1360,7 @@ do { \
lockdep_init_map(&(sk)->sk_lock.dep_map, (name), (key), 0); \ lockdep_init_map(&(sk)->sk_lock.dep_map, (name), (key), 0); \
} while (0) } while (0)
#ifdef CONFIG_LOCKDEP
static inline bool lockdep_sock_is_held(const struct sock *csk) static inline bool lockdep_sock_is_held(const struct sock *csk)
{ {
struct sock *sk = (struct sock *)csk; struct sock *sk = (struct sock *)csk;
@ -1367,6 +1368,7 @@ static inline bool lockdep_sock_is_held(const struct sock *csk)
return lockdep_is_held(&sk->sk_lock) || return lockdep_is_held(&sk->sk_lock) ||
lockdep_is_held(&sk->sk_lock.slock); lockdep_is_held(&sk->sk_lock.slock);
} }
#endif
void lock_sock_nested(struct sock *sk, int subclass); void lock_sock_nested(struct sock *sk, int subclass);