From 6d317f6f1df67f69bc82e54fedb53db0cb5597dc Mon Sep 17 00:00:00 2001
From: andrew hendry <andrew.hendry@gmail.com>
Date: Tue, 21 Sep 2010 15:24:25 +0000
Subject: [PATCH] --- yaml --- r: 214748 b: refs/heads/master c:
 40e192c3ff7b1af680b0b03e94cadf1dad5fb82e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5f2d4548c711..1d7e7fb5db1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e51b439f147670c4ddd2bf6ca4567592b5312de
+refs/heads/master: 40e192c3ff7b1af680b0b03e94cadf1dad5fb82e
diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c
index c1bbf9ec71f4..dc6767ecdaf8 100644
--- a/trunk/net/x25/af_x25.c
+++ b/trunk/net/x25/af_x25.c
@@ -909,7 +909,6 @@ static int x25_getname(struct socket *sock, struct sockaddr *uaddr,
 	struct x25_sock *x25 = x25_sk(sk);
 	int rc = 0;
 
-	lock_kernel();
 	if (peer) {
 		if (sk->sk_state != TCP_ESTABLISHED) {
 			rc = -ENOTCONN;
@@ -923,7 +922,6 @@ static int x25_getname(struct socket *sock, struct sockaddr *uaddr,
 	*uaddr_len = sizeof(*sx25);
 
 out:
-	unlock_kernel();
 	return rc;
 }