vserver 1.9.3

[linux-2.6.git] / drivers / atm / firestream.c

diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index f45adbb..68919a7 100644 (file)
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1000,7 +1000,7 @@ static int fs_open(struct atm_vcc *atm_vcc)
                                } else {
                                        r = ROUND_UP;
                                }
-                               error = make_rate (pcr, r, &tmc0, 0);
+                               error = make_rate (pcr, r, &tmc0, NULL);
                        }
                        fs_dprintk (FS_DEBUG_OPEN, "pcr = %d.\n", pcr);
                }
@@ -1220,7 +1220,7 @@ static int fs_send (struct atm_vcc *atm_vcc, struct sk_buff *skb)
 /* Some function placeholders for functions we don't yet support. */
 
 #if 0
-static int fs_ioctl(struct atm_dev *dev,unsigned int cmd,void *arg)
+static int fs_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
 {
        func_enter ();
        func_exit ();
@@ -1229,7 +1229,7 @@ static int fs_ioctl(struct atm_dev *dev,unsigned int cmd,void *arg)
 
 
 static int fs_getsockopt(struct atm_vcc *vcc,int level,int optname,
-                        void *optval,int optlen)
+                        void __user *optval,int optlen)
 {
        func_enter ();
        func_exit ();
@@ -1238,7 +1238,7 @@ static int fs_getsockopt(struct atm_vcc *vcc,int level,int optname,
 
 
 static int fs_setsockopt(struct atm_vcc *vcc,int level,int optname,
-                        void *optval,int optlen)
+                        void __user *optval,int optlen)
 {
        func_enter ();
        func_exit ();
@@ -1380,7 +1380,7 @@ static void __devinit *aligned_kmalloc (int size, int flags, int alignment)
 
        if (alignment <= 0x10) {
                t = kmalloc (size, flags);
-               if ((unsigned int)t & (alignment-1)) {
+               if ((unsigned long)t & (alignment-1)) {
                        printk ("Kmalloc doesn't align things correctly! %p\n", t);
                        kfree (t);
                        return aligned_kmalloc (size, flags, alignment * 4);
@@ -1667,7 +1667,7 @@ static int __devinit fs_init (struct fs_dev *dev)
 
        dev->hw_base = pci_resource_start(pci_dev, 0);
 
-       dev->base = (ulong) ioremap(dev->hw_base, 0x1000);
+       dev->base = ioremap(dev->hw_base, 0x1000);
 
        reset_chip (dev);
   
@@ -1704,8 +1704,7 @@ static int __devinit fs_init (struct fs_dev *dev)
                }
 
                /* Try again after 10ms. */
-               set_current_state(TASK_UNINTERRUPTIBLE);
-               schedule_timeout ((HZ+99)/100);
+               msleep(10);
        }
 
        if (!to) {