diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 11:15:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 11:15:23 -0800 |
| commit | 3f00d3e8fb963968a922d821a9a53b503b687e81 (patch) | |
| tree | dfac1c73ae63f8d48340f3bbb77ee53b322c59e9 /arch/mips/kernel/irixsig.c | |
| parent | 407cf84f956ee4b52da5508d5357b8ae212ff77c (diff) | |
| parent | a637a114f36b94a1ad8b9867f43bac0414958420 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'arch/mips/kernel/irixsig.c')
| -rw-r--r-- | arch/mips/kernel/irixsig.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c index 908e6368420..dd118c60bcd 100644 --- a/arch/mips/kernel/irixsig.c +++ b/arch/mips/kernel/irixsig.c @@ -502,8 +502,7 @@ asmlinkage int irix_sigpoll_sys(unsigned long __user *set, while(1) { long tmp = 0; - current->state = TASK_INTERRUPTIBLE; - expire = schedule_timeout(expire); + expire = schedule_timeout_interruptible(expire); for (i=0; i<=4; i++) tmp |= (current->pending.signal.sig[i] & kset.sig[i]); |