summaryrefslogtreecommitdiffstats
path: root/include/net/sock.h
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2006-11-08 22:44:35 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-02 21:21:35 -0800
commitfcc70d5fdc9b0bd3e99c9dacb8198224af2b4b42 (patch)
treef4450b97bb0cf61d731004f0fbe599662aba0f20 /include/net/sock.h
parent67f83cbf081a70426ff667e8d14f94e13ed3bdca (diff)
downloadop-kernel-dev-fcc70d5fdc9b0bd3e99c9dacb8198224af2b4b42.zip
op-kernel-dev-fcc70d5fdc9b0bd3e99c9dacb8198224af2b4b42.tar.gz
[BLUETOOTH] lockdep: annotate sk_lock nesting in AF_BLUETOOTH
============================================= [ INFO: possible recursive locking detected ] 2.6.18-1.2726.fc6 #1
Diffstat (limited to 'include/net/sock.h')
-rw-r--r--include/net/sock.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index 9cdbae2..35ffbdd 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -745,7 +745,13 @@ static inline int sk_stream_wmem_schedule(struct sock *sk, int size)
*/
#define sock_owned_by_user(sk) ((sk)->sk_lock.owner)
-extern void FASTCALL(lock_sock(struct sock *sk));
+extern void FASTCALL(lock_sock_nested(struct sock *sk, int subclass));
+
+static inline void lock_sock(struct sock *sk)
+{
+ lock_sock_nested(sk, 0);
+}
+
extern void FASTCALL(release_sock(struct sock *sk));
/* BH context may only use the following locking interface. */
OpenPOWER on IntegriCloud