diff options
| author | Peter Galbavy <peter@cvs.openbsd.org> | 1999-07-30 14:45:34 +0000 |
|---|---|---|
| committer | Peter Galbavy <peter@cvs.openbsd.org> | 1999-07-30 14:45:34 +0000 |
| commit | 2d131282dabeb59997e716557431544d132defee (patch) | |
| tree | 36b98c66a45bd7e085f283abb47dcf53504808af /sys/dev/raidframe/rf_revent.c | |
| parent | aad8058264cfbb51ec169e8ecd7f04209b706634 (diff) | |
Update RAIDframe from NetBSD-current as of 1999/07/26.
Please note that you *must* follow the upgrade instructions at
http://www.cs.usask.ca/staff/oster/clabel_upgrade.html
before installing the new raidctl and new kernel using this code.
Diffstat (limited to 'sys/dev/raidframe/rf_revent.c')
| -rw-r--r-- | sys/dev/raidframe/rf_revent.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/raidframe/rf_revent.c b/sys/dev/raidframe/rf_revent.c index e58736c7cd9..b6916c22a91 100644 --- a/sys/dev/raidframe/rf_revent.c +++ b/sys/dev/raidframe/rf_revent.c @@ -1,5 +1,5 @@ -/* $OpenBSD: rf_revent.c,v 1.2 1999/02/16 00:03:24 niklas Exp $ */ -/* $NetBSD: rf_revent.c,v 1.3 1999/02/05 00:06:17 oster Exp $ */ +/* $OpenBSD: rf_revent.c,v 1.3 1999/07/30 14:45:33 peter Exp $ */ +/* $NetBSD: rf_revent.c,v 1.4 1999/03/14 21:53:31 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -51,7 +51,7 @@ static RF_FreeList_t *rf_revent_freelist; extern int hz; -#define DO_WAIT(_rc) tsleep(&(_rc)->eventQueue, PRIBIO | PCATCH, "raidframe eventq", 0) +#define DO_WAIT(_rc) tsleep(&(_rc)->eventQueue, PRIBIO, "raidframe eventq", 0) #define DO_SIGNAL(_rc) wakeup(&(_rc)->eventQueue) @@ -146,7 +146,7 @@ rf_GetNextReconEvent(reconDesc, row, continueFunc, continueArg) #if RF_RECON_STATS > 0 reconDesc->numReconExecDelays++; #endif /* RF_RECON_STATS > 0 */ - status = tsleep(&reconDesc->reconExecTicks, PRIBIO | PCATCH, "recon delay", RECON_TIMO); + status = tsleep(&reconDesc->reconExecTicks, PRIBIO, "recon delay", RECON_TIMO); RF_ASSERT(status == EWOULDBLOCK); reconDesc->reconExecTicks = 0; } |