patch-2.1.57 linux/drivers/char/apm_bios.c

• Lines: 28
• Date: Sat Sep 20 15:21:42 1997
• Orig file: v2.1.56/linux/drivers/char/apm_bios.c
• Orig date: Tue Sep 23 16:48:47 1997

diff -u --recursive --new-file v2.1.56/linux/drivers/char/apm_bios.c linux/drivers/char/apm_bios.c
@@ -831,8 +831,7 @@
 		add_wait_queue(&process_list, &wait);
 repeat:
 		current->state = TASK_INTERRUPTIBLE;
-		if (queue_empty(as)
-		    && !(current->signal & ~current->blocked)) {
+		if (queue_empty(as) && !signal_pending(current)) {
 			schedule();
 			goto repeat;
 		}
@@ -859,7 +858,7 @@
 	}
 	if (i < count)
 		return count - i;
-	if (current->signal & ~current->blocked)
+	if (signal_pending(current))
 		return -ERESTARTSYS;
 	return 0;
 }
@@ -958,7 +957,7 @@
 
 	as = (struct apm_bios_struct *)kmalloc(sizeof(*as), GFP_KERNEL);
 	if (as == NULL) {
-		printk(KERN_ER "apm_bios: cannot allocate struct of size %d bytes",
+		printk(KERN_ERR "apm_bios: cannot allocate struct of size %d bytes",
 		       sizeof(*as));
 		return -ENOMEM;
 	}