---

yaml --- r: 214477 b: refs/heads/master c: f39234d h: refs/heads/master i: 214475: 363d260 v: v3
git-mirror · Sep 9, 2010 · b29cfd4 · b29cfd4
1 parent 661af75
commit b29cfd4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a700d8be733bd593ea4797dfde17aed4f35213c0
+refs/heads/master: f39234d60617d37818b30991e6794643ce220296
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
@@ -1557,6 +1557,8 @@ struct sk_buff *sock_alloc_send_skb(struct sock *sk, unsigned long size,
 EXPORT_SYMBOL(sock_alloc_send_skb);
 
 static void __lock_sock(struct sock *sk)
+	__releases(&sk->sk_lock.slock)
+	__acquires(&sk->sk_lock.slock)
 {
 	DEFINE_WAIT(wait);
 
@@ -1573,6 +1575,8 @@ static void __lock_sock(struct sock *sk)
 }
 
 static void __release_sock(struct sock *sk)
+	__releases(&sk->sk_lock.slock)
+	__acquires(&sk->sk_lock.slock)
 {
 	struct sk_buff *skb = sk->sk_backlog.head;