diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-01 04:02:08 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-01 04:02:08 +0000 |
commit | fd095d09f2d475dc2e8599b1b8bae1cd65e91685 (patch) | |
tree | 217f87a997699505e0dd752931409b9f10fffe65 /net/sunrpc/sched.c | |
parent | c02e0599c4233f97071928f8118841954bacdadf (diff) |
Merge with 2.1.56 as first part of merging back my code.
Diffstat (limited to 'net/sunrpc/sched.c')
-rw-r--r-- | net/sunrpc/sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index 960093cad..fb02640f9 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -390,7 +390,7 @@ __rpc_execute(struct rpc_task *task) dprintk("RPC: %4d sync task going to sleep\n", task->tk_pid); current->timeout = 0; - interruptible_sleep_on(&task->tk_wait); + sleep_on(&task->tk_wait); /* When the task received a signal, remove from * any queues etc, and make runnable again. */ @@ -408,7 +408,7 @@ __rpc_execute(struct rpc_task *task) * clean up after sleeping on some queue, we don't * break the loop here, but go around once more. */ - if (!RPC_IS_ASYNC(task) && signalled()) { + if (0 && !RPC_IS_ASYNC(task) && signalled()) { dprintk("RPC: %4d got signal (map %08lx)\n", task->tk_pid, current->signal & ~current->blocked); |