diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-03 17:49:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-03 17:49:53 +0000 |
| commit | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (patch) | |
| tree | 5746fea1605ff013be9b78a1556aaad7615d664a /arch/mips/kernel/sysirix.c | |
| parent | 80ea5b1e15398277650e1197957053b5a71c08bc (diff) | |
Merge with Linux 2.1.131 plus some more MIPS goodies.
Diffstat (limited to 'arch/mips/kernel/sysirix.c')
| -rw-r--r-- | arch/mips/kernel/sysirix.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c index d1c2da72a..056a268eb 100644 --- a/arch/mips/kernel/sysirix.c +++ b/arch/mips/kernel/sysirix.c @@ -1,4 +1,4 @@ -/* $Id: sysirix.c,v 1.12 1998/08/17 10:16:27 ralf Exp $ +/* $Id: sysirix.c,v 1.12 1998/08/25 09:14:42 ralf Exp $ * * sysirix.c: IRIX system call emulation. * @@ -1081,13 +1081,8 @@ out: asmlinkage int irix_sginap(int ticks) { - lock_kernel(); - if(ticks) { - current->timeout = ticks + jiffies; - current->state = TASK_INTERRUPTIBLE; - } - schedule(); - unlock_kernel(); + current->state = TASK_INTERRUPTIBLE; + schedule_timeout(ticks); return 0; } |