diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-02 14:49:20 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-02 14:49:20 +0000 |
| commit | ad1267dce7d02ffdcefd1e50ea13b01ef11e959d (patch) | |
| tree | 26bf2cc270c467b23748918880bd3be3535c33e1 /drivers/sgi/char | |
| parent | eeac643f6a7fb3d6713face2d65b11fbc959f005 (diff) | |
Make the thing compile.
Diffstat (limited to 'drivers/sgi/char')
| -rw-r--r-- | drivers/sgi/char/shmiq.c | 14 | ||||
| -rw-r--r-- | drivers/sgi/char/usema.c | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/sgi/char/shmiq.c b/drivers/sgi/char/shmiq.c index 78ebdd692..27365ae57 100644 --- a/drivers/sgi/char/shmiq.c +++ b/drivers/sgi/char/shmiq.c @@ -270,7 +270,7 @@ qcntl_ioctl (struct inode *inode, struct file *filp, unsigned int cmd, unsigned vaddr = (unsigned long) req.user_vaddr; vma = find_vma (current->mm, vaddr); if (!vma){ - printk ("SHMIQ: could not find %x the vma\n", vaddr); + printk ("SHMIQ: could not find %lx the vma\n", vaddr); return -EINVAL; } s = req.arg * sizeof (struct shmqevent) + sizeof (struct sharedMemoryInputQueue); @@ -305,9 +305,9 @@ static struct vm_operations_struct qcntl_mmap = { }; static int -shmiq_qcntl_mmap (struct inode *inode, struct file *filp, struct vm_area_struct *vma) +shmiq_qcntl_mmap (struct file *file, struct vm_area_struct *vma) { - int minor = MINOR (inode->i_rdev), error; + int minor = MINOR (file->f_dentry->d_inode->i_rdev), error; unsigned int size; unsigned long mem, start; @@ -394,12 +394,12 @@ shmiq_qcntl_open (struct inode *inode, struct file *filp) } static int -shmiq_qcntl_fasync (struct inode *inode, struct file *filp, int on) +shmiq_qcntl_fasync (struct file *file, int on) { int retval; - int minor = MINOR (inode->i_rdev); + int minor = MINOR (file->f_dentry->d_inode->i_rdev); - retval = fasync_helper (inode, filp, on, &shmiqs [minor].fasync); + retval = fasync_helper (file, on, &shmiqs [minor].fasync); if (retval < 0) return retval; return 0; @@ -422,7 +422,7 @@ shmiq_qcntl_close (struct inode *inode, struct file *filp) return -EINVAL; lock_kernel (); - shmiq_qcntl_fasync (inode, filp, 0); + shmiq_qcntl_fasync (filp, 0); shmiqs [minor].opened = 0; shmiqs [minor].mapped = 0; shmiqs [minor].events = 0; diff --git a/drivers/sgi/char/usema.c b/drivers/sgi/char/usema.c index ec8ce3a48..31a71d5aa 100644 --- a/drivers/sgi/char/usema.c +++ b/drivers/sgi/char/usema.c @@ -64,7 +64,7 @@ sgi_usemaclone_ioctl(struct inode *inode, struct file *file, unsigned int cmd, struct irix_usema *usema = file->private_data; int retval; - printk("[%s:%d] wants ioctl 0x%xd (arg 0x%xd)", + printk("[%s:%d] wants ioctl 0x%xd (arg 0x%lx)", current->comm, current->pid, cmd, arg); switch(cmd) { @@ -105,9 +105,9 @@ sgi_usemaclone_ioctl(struct inode *inode, struct file *file, unsigned int cmd, printk("UIOC*BLOCK: putting process %d to sleep on usema %p", current->pid, usema); if (cmd == UIOCNOIBLOCK) - interruptible_sleep_on(usema->proc_list); + interruptible_sleep_on(&usema->proc_list); else - sleep_on(usema->proc_list); + sleep_on(&usema->proc_list); return 0; } case UIOCAUNBLOCK: /* XXX make `async' */ @@ -125,7 +125,7 @@ sgi_usemaclone_ioctl(struct inode *inode, struct file *file, unsigned int cmd, printk("[%s:%d] releasing usema %p", current->comm, current->pid, usema); - wake_up(usema->proc_list); + wake_up(&usema->proc_list); return 0; } } |