diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-07 20:40:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-07 20:40:25 -0400 |
| commit | b33b0a1bf69faff89693df49519fa7b459f5d807 (patch) | |
| tree | a8de7deda833a9e7cfd837da4abe2140eb506fd3 /include/net/sock.h | |
| parent | 03be98226c14d787939381b9f42d81764ea8eedc (diff) | |
| download | linux-b33b0a1bf69faff89693df49519fa7b459f5d807.tar.gz linux-b33b0a1bf69faff89693df49519fa7b459f5d807.tar.xz | |
net: Fix build failure due to lockdep_sock_is_held().
Needs to be protected with CONFIG_LOCKDEP.
Based upon a patch by Hannes Frederic Sowa.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 46b29374df8e..81d6fecec0a2 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1360,6 +1360,7 @@ do { \ lockdep_init_map(&(sk)->sk_lock.dep_map, (name), (key), 0); \ } while (0) +#ifdef CONFIG_LOCKDEP static inline bool lockdep_sock_is_held(const 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) || lockdep_is_held(&sk->sk_lock.slock); } +#endif void lock_sock_nested(struct sock *sk, int subclass); |