From: Hannes Frederic Sowa <han...@stressinduktion.org>
Date: Fri, 8 Apr 2016 01:35:18 +0200
> lockdep_is_held is only specified if CONFIG_LOCKDEP is defined, so make
> it depending on it.
>
> Also add the missing inline keyword, so no warnings about unused functions
> show up during complilation.
>
> Cc: Eric Dumazet <eric.duma...@gmail.com>
> Cc: David Miller <da...@davemloft.net>
> Signed-off-by: Hannes Frederic Sowa <han...@stressinduktion.org>
I already applied your inline patch, I applied the following:
====================
[PATCH] 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 <da...@davemloft.net>
---
include/net/sock.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/net/sock.h b/include/net/sock.h
index 46b2937..81d6fec 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);
--
2.1.0
