patch-2.4.0-test3 linux/drivers/sgi/char/usema.c

• Lines: 67
• Date: Sun Jul 9 22:32:58 2000
• Orig file: v2.4.0-test2/linux/drivers/sgi/char/usema.c
• Orig date: Thu Feb 10 17:11:14 2000

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/sgi/char/usema.c linux/drivers/sgi/char/usema.c
@@ -67,7 +67,7 @@
 	struct irix_usema *usema = file->private_data;
 	int retval;
 	
-	printk("[%s:%ld] wants ioctl 0x%xd (arg 0x%lx)",
+	printk("[%s:%d] wants ioctl 0x%xd (arg 0x%lx)",
 	       current->comm, current->pid, cmd, arg);
 
 	switch(cmd) {
@@ -79,7 +79,7 @@
 		usattach_t *attach = (usattach_t *)arg;
 		retval = verify_area(VERIFY_READ, attach, sizeof(usattach_t));
 		if (retval) {
-			printk("[%s:%ld] sgi_usema_ioctl(UIOCATTACHSEMA): "
+			printk("[%s:%d] sgi_usema_ioctl(UIOCATTACHSEMA): "
 			       "verify_area failure",
 			       current->comm, current->pid);
 			return retval;
@@ -87,7 +87,7 @@
 		if (usema == 0)
 			return -EINVAL;
 
-		printk("UIOCATTACHSEMA: attaching usema %p to process %ld\n",
+		printk("UIOCATTACHSEMA: attaching usema %p to process %d\n",
 		       usema, current->pid);
 		/* XXX what is attach->us_handle for? */
 		return sgi_usema_attach(attach, usema);
@@ -101,12 +101,12 @@
 
 		retval = verify_area(VERIFY_READ, attach, sizeof(usattach_t));
 		if (retval) {
-			printk("[%s:%ld] sgi_usema_ioctl(UIOC*BLOCK): "
+			printk("[%s:%d] sgi_usema_ioctl(UIOC*BLOCK): "
 			       "verify_area failure",
 			       current->comm, current->pid);
 			return retval;
 		}
-		printk("UIOC*BLOCK: putting process %ld to sleep on usema %p",
+		printk("UIOC*BLOCK: putting process %d to sleep on usema %p",
 		       current->pid, usema);
 		if (cmd == UIOCNOIBLOCK)
 			interruptible_sleep_on(&usema->proc_list);
@@ -121,13 +121,13 @@
 
 		retval = verify_area(VERIFY_READ, attach, sizeof(usattach_t));
 		if (retval) {
-			printk("[%s:%ld] sgi_usema_ioctl(UIOC*BLOCK): "
+			printk("[%s:%d] sgi_usema_ioctl(UIOC*BLOCK): "
 			       "verify_area failure",
 			       current->comm, current->pid);
 			return retval;
 		}
 
-		printk("[%s:%ld] releasing usema %p",
+		printk("[%s:%d] releasing usema %p",
 		       current->comm, current->pid, usema);
 		wake_up(&usema->proc_list);
 		return 0;
@@ -141,7 +141,7 @@
 {
 	struct irix_usema *usema = filp->private_data;
 	
-	printk("[%s:%ld] wants to poll usema %p",
+	printk("[%s:%d] wants to poll usema %p",
 	       current->comm, current->pid, usema);
 	
 	return 0;