diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /fs/coda/upcall.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'fs/coda/upcall.c')
| -rw-r--r-- | fs/coda/upcall.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c index 62fd62e35..9aecd8a6e 100644 --- a/fs/coda/upcall.c +++ b/fs/coda/upcall.c @@ -625,9 +625,9 @@ static inline unsigned long coda_waitfor_upcall(struct upc_req *vmp) add_wait_queue(&vmp->uc_sleep, &wait); for (;;) { if ( coda_hard == 0 ) - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); else - current->state = TASK_UNINTERRUPTIBLE; + set_current_state(TASK_UNINTERRUPTIBLE); /* got a reply */ if ( vmp->uc_flags & REQ_WRITE ) @@ -710,8 +710,8 @@ ENTRY; /* Append msg to pending queue and poke Venus. */ list_add(&(req->uc_chain), vcommp->vc_pending.prev); CDEBUG(D_UPCALL, - "Proc %d wake Venus for(opc,uniq) =(%d,%d) msg at %x.zzz.\n", - current->pid, req->uc_opcode, req->uc_unique, (int)req); + "Proc %d wake Venus for(opc,uniq) =(%d,%d) msg at %p.zzz.\n", + current->pid, req->uc_opcode, req->uc_unique, req); wake_up_interruptible(&vcommp->vc_waitq); /* We can be interrupted while we wait for Venus to process @@ -731,8 +731,8 @@ ENTRY; req->uc_opcode, jiffies - req->uc_posttime, req->uc_unique, req->uc_outSize); CDEBUG(D_UPCALL, - "..process %d woken up by Venus for req at 0x%x, data at %x\n", - current->pid, (int)req, (int)req->uc_data); + "..process %d woken up by Venus for req at %p, data at %p\n", + current->pid, req, req->uc_data); if (vcommp->vc_pid) { /* i.e. Venus is still alive */ /* Op went through, interrupt or not... */ if (req->uc_flags & REQ_WRITE) { |