- rel 3 (with reclaim xfs hack)

[packages/kernel.git] / kernel-atmdd.patch

diff --git a/kernel-atmdd.patch b/kernel-atmdd.patch
index be2cb5347be7ae58682b10a94ff66336e17bc548..a380fce14311ed90460607e6f3afaa21ef90d097 100644 (file)
--- a/kernel-atmdd.patch
+++ b/kernel-atmdd.patch
@@ -170,8 +170,8 @@ diff -urN linux-2.4.25/drivers/atm/atmdd.c linux-2.4.25-atmdd/drivers/atm/atmdd.
 +static int myatmdd_open(struct atm_vcc *vcc);
 +static void myatmdd_close(struct atm_vcc *vcc);
 +static int myatmdd_ioctl(struct atm_dev *dev, unsigned int cmd,void *arg);
-+static int myatmdd_setsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen);
-+static int myatmdd_getsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen);
++static int myatmdd_setsockopt(struct atm_vcc *vcc,int level,int optname, void __user *optval,unsigned int optlen);
++static int myatmdd_getsockopt(struct atm_vcc *vcc,int level,int optname, void __user *optval,int optlen);
 +static int myatmdd_send(struct atm_vcc *vcc,struct sk_buff *skb);
 +static int myatmdd_change_qos(struct atm_vcc *vcc,struct atm_qos *qos,int flgs);
 +static int myatmdd_proc_read(struct atm_dev *dev,loff_t *pos,char *page);
@@ -789,12 +789,12 @@ diff -urN linux-2.4.25/drivers/atm/atmdd.c linux-2.4.25-atmdd/drivers/atm/atmdd.
 +    return -EINVAL;
 +}
 +
-+static int myatmdd_getsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen)
++static int myatmdd_getsockopt(struct atm_vcc *vcc,int level,int optname, void __user *optval,int optlen)
 +{
 +    return -EINVAL;
 +}
 +
-+static int myatmdd_setsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen)
++static int myatmdd_setsockopt(struct atm_vcc *vcc,int level,int optname, void __user *optval,unsigned int optlen)
 +{
 +    return -EINVAL;
 +}
@@ -885,7 +885,7 @@ diff -urN linux-2.4.25/drivers/atm/atmdd.c linux-2.4.25-atmdd/drivers/atm/atmdd.
 +        return -ENOMEM;
 +
 +    /* Register the new device */
-+    myatmdd_dev = atm_dev_register(MYATMDD,&myatmdd_ops,-1,NULL);
++    myatmdd_dev = atm_dev_register(MYATMDD,NULL,&myatmdd_ops,-1,NULL);
 +    
 +    /* Were we able to register this device? */
 +    if (myatmdd_dev == NULL)