diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
| commit | 230e5ab6a084ed50470f101934782dbf54b0d06b (patch) | |
| tree | 5dd821c8d33f450470588e7a543f74bf74306e9e /arch/mips/kernel/irixsig.c | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'arch/mips/kernel/irixsig.c')
| -rw-r--r-- | arch/mips/kernel/irixsig.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c index c84a391a7..76c5abf71 100644 --- a/arch/mips/kernel/irixsig.c +++ b/arch/mips/kernel/irixsig.c @@ -1,4 +1,4 @@ -/* $Id: irixsig.c,v 1.4 1997/08/05 09:43:10 ralf Exp $ +/* $Id: irixsig.c,v 1.5 1997/12/01 17:57:27 ralf Exp $ * irixsig.c: WHEEE, IRIX signals! YOW, am I compatable or what?!?! * * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) @@ -565,7 +565,7 @@ asmlinkage int irix_sigpoll_sys(unsigned long *set, struct irix5_siginfo *info, timeo = 1; break; } - if(current->signal & ~(current->blocked)) return -EINTR; + if(signal_pending(current)) return -EINTR; } if(timeo) return -EAGAIN; @@ -692,7 +692,7 @@ repeat: if(options & W_NOHANG) goto end_waitsys; retval = -ERESTARTSYS; - if(current->signal & ~current->blocked) + if(signal_pending(current)) goto end_waitsys; current->state = TASK_INTERRUPTIBLE; schedule(); |