net: Fix build failure due to lockdep_sock_is_held().
authorDavid S. Miller <davem@davemloft.net>
Fri, 8 Apr 2016 00:40:25 +0000 (20:40 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 8 Apr 2016 00:40:25 +0000 (20:40 -0400)
Needs to be protected with CONFIG_LOCKDEP.

Based upon a patch by Hannes Frederic Sowa.

Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/sock.h

index 46b29374df8ed74fbd48fa87c19d90cf3d6e1320..81d6fecec0a2c0ec4af0bd8b1e2c87f12a68e555 100644 (file)
@@ -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);