diff options
Diffstat (limited to 'drivers/sgi/char/usema.c')
| -rw-r--r-- | drivers/sgi/char/usema.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/drivers/sgi/char/usema.c b/drivers/sgi/char/usema.c index 31a71d5aa..dfef772eb 100644 --- a/drivers/sgi/char/usema.c +++ b/drivers/sgi/char/usema.c @@ -27,6 +27,7 @@ #include <linux/sched.h> #include <linux/file.h> #include <linux/major.h> +#include <linux/poll.h> #include <linux/string.h> #include <linux/dcache.h> #include <linux/mm.h> @@ -64,7 +65,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%lx)", + printk("[%s:%ld] wants ioctl 0x%xd (arg 0x%lx)", current->comm, current->pid, cmd, arg); switch(cmd) { @@ -76,7 +77,7 @@ sgi_usemaclone_ioctl(struct inode *inode, struct file *file, unsigned int cmd, usattach_t *attach = (usattach_t *)arg; retval = verify_area(VERIFY_READ, attach, sizeof(usattach_t)); if (retval) { - printk("[%s:%d] sgi_usema_ioctl(UIOCATTACHSEMA): " + printk("[%s:%ld] sgi_usema_ioctl(UIOCATTACHSEMA): " "verify_area failure", current->comm, current->pid); return retval; @@ -84,7 +85,8 @@ sgi_usemaclone_ioctl(struct inode *inode, struct file *file, unsigned int cmd, if (usema == 0) return -EINVAL; - printk("UIOCATTACHSEMA: attaching usema %p to process %d\n", usema, current->pid); + printk("UIOCATTACHSEMA: attaching usema %p to process %ld\n", + usema, current->pid); /* XXX what is attach->us_handle for? */ return sgi_usema_attach(attach, usema); break; @@ -97,12 +99,12 @@ sgi_usemaclone_ioctl(struct inode *inode, struct file *file, unsigned int cmd, retval = verify_area(VERIFY_READ, attach, sizeof(usattach_t)); if (retval) { - printk("[%s:%d] sgi_usema_ioctl(UIOC*BLOCK): " + printk("[%s:%ld] sgi_usema_ioctl(UIOC*BLOCK): " "verify_area failure", current->comm, current->pid); return retval; } - printk("UIOC*BLOCK: putting process %d to sleep on usema %p", + printk("UIOC*BLOCK: putting process %ld to sleep on usema %p", current->pid, usema); if (cmd == UIOCNOIBLOCK) interruptible_sleep_on(&usema->proc_list); @@ -117,13 +119,13 @@ sgi_usemaclone_ioctl(struct inode *inode, struct file *file, unsigned int cmd, retval = verify_area(VERIFY_READ, attach, sizeof(usattach_t)); if (retval) { - printk("[%s:%d] sgi_usema_ioctl(UIOC*BLOCK): " + printk("[%s:%ld] sgi_usema_ioctl(UIOC*BLOCK): " "verify_area failure", current->comm, current->pid); return retval; } - printk("[%s:%d] releasing usema %p", + printk("[%s:%ld] releasing usema %p", current->comm, current->pid, usema); wake_up(&usema->proc_list); return 0; @@ -137,7 +139,8 @@ sgi_usemaclone_poll(struct file *filp, poll_table *wait) { struct irix_usema *usema = filp->private_data; - printk("[%s:%d] wants to poll usema %p", current->comm, current->pid, usema); + printk("[%s:%ld] wants to poll usema %p", + current->comm, current->pid, usema); return 0; } @@ -186,6 +189,7 @@ static struct miscdevice dev_usemaclone = { void usema_init(void) { - printk("usemaclone misc device registered (minor: %d)\n", SGI_USEMACLONE); + printk("usemaclone misc device registered (minor: %d)\n", + SGI_USEMACLONE); misc_register(&dev_usemaclone); } |