From b469dde7cb0005dc48d792c45667d7be4b9778fb Mon Sep 17 00:00:00 2001
From: andrew hendry <andrew.hendry@gmail.com>
Date: Tue, 14 Sep 2010 13:31:16 +0000
Subject: [PATCH] --- yaml --- r: 214519 b: refs/heads/master c:
 25aa4efe4feb4150fe613169795df505c5018f2b h: refs/heads/master i:   214517:
 6eded6e42150884597766027c7b7fe56fc7e822a   214515:
 0a1a9389b9215375f2aab9092d1c6452bb95ebfa   214511:
 25bf6da45c4ed95d4e8ecb0c4fce9bbcd78191ad v: v3

---
 [refs]                 | 2 +-
 trunk/net/x25/af_x25.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 581bcd9eeb6c..d8bdd8a4aa75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55b1804c678e679e1018671bd40b583eab124689
+refs/heads/master: 25aa4efe4feb4150fe613169795df505c5018f2b
diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c
index 5e86d4e97dce..f6a8f175b4f5 100644
--- a/trunk/net/x25/af_x25.c
+++ b/trunk/net/x25/af_x25.c
@@ -507,14 +507,14 @@ static int x25_listen(struct socket *sock, int backlog)
 	struct sock *sk = sock->sk;
 	int rc = -EOPNOTSUPP;
 
-	lock_kernel();
+	lock_sock(sk);
 	if (sk->sk_state != TCP_LISTEN) {
 		memset(&x25_sk(sk)->dest_addr, 0, X25_ADDR_LEN);
 		sk->sk_max_ack_backlog = backlog;
 		sk->sk_state           = TCP_LISTEN;
 		rc = 0;
 	}
-	unlock_kernel();
+	release_sock(sk);
 
 	return rc;
 }