patch-2.1.57 linux/kernel/sched.c

• Lines: 20
• Date: Sat Sep 20 14:51:55 1997
• Orig file: v2.1.56/linux/kernel/sched.c
• Orig date: Thu Sep 11 09:02:24 1997

diff -u --recursive --new-file v2.1.56/linux/kernel/sched.c linux/kernel/sched.c
@@ -400,7 +400,7 @@
 	timeout = 0;
 	switch (prev->state) {
 		case TASK_INTERRUPTIBLE:
-			if (prev->signal & ~prev->blocked)
+			if (signal_pending(prev))
 				goto makerunnable;
 			timeout = prev->timeout;
 			if (timeout && (timeout <= jiffies)) {
@@ -623,9 +623,7 @@
 		if (waking_non_zero(sem))	/* are we waking up?  */
 			break;			/* yes, exit loop */
 
-		if (   task_state == TASK_INTERRUPTIBLE
-		    && (tsk->signal & ~tsk->blocked)	/* signalled */
-		   ) {
+		if (task_state == TASK_INTERRUPTIBLE && signal_pending(tsk)) {
 			ret = -EINTR;			/* interrupted */
 			atomic_inc(&sem->count);	/* give up on down operation */
 			break;