From b29cfd42ef67bcfe0c3c90441e3794e29545fc19 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung@gmail.com>
Date: Wed, 8 Sep 2010 03:48:48 +0000
Subject: [PATCH] --- yaml --- r: 214477 b: refs/heads/master c:
 f39234d60617d37818b30991e6794643ce220296 h: refs/heads/master i:   214475:
 363d260bbd289ca340dab8a962193dc6cb2e7a08 v: v3

---
 [refs]                | 2 +-
 trunk/net/core/sock.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3b114da726b4..b77365756e58 100644
--- 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
index b05b9b6ddb87..f3a06c40d5e0 100644
--- 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;