patch-2.1.34 linux/ipc/msg.c

• Lines: 18
• Date: Fri Apr 11 22:11:21 1997
• Orig file: v2.1.33/linux/ipc/msg.c
• Orig date: Sun Jan 26 02:07:48 1997

diff -u --recursive --new-file v2.1.33/linux/ipc/msg.c linux/ipc/msg.c
@@ -137,7 +137,7 @@
 				return -EAGAIN;
 			if (current->signal & ~current->blocked)
 				return -EINTR;
-			if (intr_count) {
+			if (in_interrupt()) {
 				/* Very unlikely, but better safe than sorry */
 				printk(KERN_WARNING "Ouch, kerneld:msgsnd buffers full!\n");
 				return -EINTR;
@@ -774,7 +774,7 @@
 		return -ENODEV;
 
 	/* Do not wait for an answer at interrupt-time! */
-	if (intr_count)
+	if (in_interrupt())
 		ret_size &= ~KERNELD_WAIT;
 #ifdef NEW_KERNELD_PROTOCOL
 	else