Merge commit 'v2.6.32-rc5' into perf/probes

[karo-tx-linux.git] / net / atm / svc.c

diff --git a/net/atm/svc.c b/net/atm/svc.c
index 7b831b526d0bce4fccb9204a4c9ee7adc3c3bafc..f90d143c4b2592d6ed2145724d580911b9839c28 100644 (file)
--- a/net/atm/svc.c
+++ b/net/atm/svc.c
@@ -446,7 +446,7 @@ int svc_change_qos(struct atm_vcc *vcc,struct atm_qos *qos)
 
 
 static int svc_setsockopt(struct socket *sock, int level, int optname,
-                         char __user *optval, int optlen)
+                         char __user *optval, unsigned int optlen)
 {
        struct sock *sk = sock->sk;
        struct atm_vcc *vcc = ATM_SD(sock);