diff options
| author | he <he@NetBSD.org> | 2008-01-03 16:06:24 +0000 |
|---|---|---|
| committer | he <he@NetBSD.org> | 2008-01-03 16:06:24 +0000 |
| commit | 75fc209bcff9d8d6e12f86f2193c0ed893636175 (patch) | |
| tree | 2c39cbcdc5e9ec2686bdc0b54b0160c11ee109f2 /sys/arch/atari/dev/hdfd.c | |
| parent | 1f7bd3c33159a59ee2e2d381f459c4f7e59d3a83 (diff) | |
Fix a cv_timedwait() usage after the vmlocking2 merge, and remove
a now-no-longer-used local variable.
Diffstat (limited to 'sys/arch/atari/dev/hdfd.c')
| -rw-r--r-- | sys/arch/atari/dev/hdfd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/atari/dev/hdfd.c b/sys/arch/atari/dev/hdfd.c index bbee5de9d15..5757bff9faf 100644 --- a/sys/arch/atari/dev/hdfd.c +++ b/sys/arch/atari/dev/hdfd.c @@ -1,4 +1,4 @@ -/* $NetBSD: hdfd.c,v 1.60 2008/01/02 11:48:23 ad Exp $ */ +/* $NetBSD: hdfd.c,v 1.61 2008/01/03 16:06:24 he Exp $ */ /*- * Copyright (c) 1996 Leo Weppelman @@ -91,7 +91,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.60 2008/01/02 11:48:23 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.61 2008/01/03 16:06:24 he Exp $"); #include "opt_ddb.h" @@ -1525,7 +1525,7 @@ fdformat(dev, finfo, p) struct ne7_fd_formb *finfo; struct proc *p; { - int rv = 0, s; + int rv = 0; struct fd_softc *fd = hdfd_cd.cd_devs[FDUNIT(dev)]; struct fd_type *type = fd->sc_type; struct buf *bp; @@ -1560,7 +1560,7 @@ fdformat(dev, finfo, p) /* ...and wait for it to complete */ mutex_enter(bp->b_objlock); while(!(bp->b_oflags & BO_DONE)) { - rv = cv_timedwait(&bp->b_done, 20 * hz); + rv = cv_timedwait(&bp->b_done, bp->b_objlock, 20 * hz); if (rv == EWOULDBLOCK) break; } |
