X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=net%2Fatm%2Fpvc.c;h=f2c541774dcd77e14a7dc8cc47c53a36b3b6f3bb;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=c0ce4d4d20b6f5633d104ce1a35c461daa23ddd9;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/net/atm/pvc.c b/net/atm/pvc.c
index c0ce4d4d2..f2c541774 100644
--- a/net/atm/pvc.c
+++ b/net/atm/pvc.c
@@ -60,7 +60,7 @@ static int pvc_connect(struct socket *sock,struct sockaddr *sockaddr,
 }
 
 static int pvc_setsockopt(struct socket *sock, int level, int optname,
-			  char *optval, int optlen)
+			  char __user *optval, int optlen)
 {
 	struct sock *sk = sock->sk;
 	int error;
@@ -73,7 +73,7 @@ static int pvc_setsockopt(struct socket *sock, int level, int optname,
 
 
 static int pvc_getsockopt(struct socket *sock, int level, int optname,
-		          char *optval, int *optlen)
+		          char __user *optval, int __user *optlen)
 {
 	struct sock *sk = sock->sk;
 	int error;
@@ -102,7 +102,7 @@ static int pvc_getname(struct socket *sock,struct sockaddr *sockaddr,
 }
 
 
-static struct proto_ops pvc_proto_ops = {
+static const struct proto_ops pvc_proto_ops = {
 	.family =	PF_ATMPVC,
 	.owner =	THIS_MODULE,