X.25 remove bkl in poll

The x25_datagram_poll didn't add anything, removed it. Signed-off-by: Andrew Hendry <[email protected]> Signed-off-by: David S. Miller <[email protected]>
redpig · Sep 22, 2010 · 768190f · 768190f
1 parent 40e192c
commit 768190f
Showing 1 changed file with 1 addition and 13 deletions.
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
@@ -925,18 +925,6 @@ static int x25_getname(struct socket *sock, struct sockaddr *uaddr,
 	return rc;
 }
 
-static unsigned int x25_datagram_poll(struct file *file, struct socket *sock,
-			   poll_table *wait)
-{
-	int rc;
-
-	lock_kernel();
-	rc = datagram_poll(file, sock, wait);
-	unlock_kernel();
-
-	return rc;
-}
-
 int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb,
 			unsigned int lci)
 {
@@ -1744,7 +1732,7 @@ static const struct proto_ops x25_proto_ops = {
 	.socketpair =	sock_no_socketpair,
 	.accept =	x25_accept,
 	.getname =	x25_getname,
-	.poll =		x25_datagram_poll,
+	.poll =		datagram_poll,
 	.ioctl =	x25_ioctl,
 #ifdef CONFIG_COMPAT
 	.compat_ioctl = compat_x25_ioctl,