d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use tsleep() rather than msleep() with a NULL mtx.

Browse Source
This commit is contained in:
jhb 2007-02-27 17:15:39 +00:00
parent a0324781f2
commit e946f637f6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/arm/at91/at91_spi.c
View File

@ -248,7 +248,7 @@ at91_spi_transfer(device_t dev, device_t child, struct spi_command *cmd)
rxdone = sc->rxdone;
do {
err = msleep(&sc->rxdone, NULL, PCATCH | PZERO, "spi", hz);
err = tsleep(&sc->rxdone, PCATCH | PZERO, "spi", hz);
} while (rxdone == sc->rxdone && err != EINTR);
WR4(sc, PDC_PTCR, PDC_PTCR_TXTDIS | PDC_PTCR_RXTDIS);
if (err == 0) {

6
sys/cam/scsi/scsi_target.c
View File

@ -810,8 +810,8 @@ targread(struct cdev *dev, struct uio *uio, int ioflag)
user_descr = TAILQ_FIRST(abort_queue);
while (ccb_h == NULL && user_descr == NULL) {
if ((ioflag & IO_NDELAY) == 0) {
error = msleep(user_queue, NULL,
PRIBIO | PCATCH, "targrd", 0);
error = tsleep(user_queue,
PRIBIO | PCATCH, "targrd", 0);
ccb_h = TAILQ_FIRST(user_queue);
user_descr = TAILQ_FIRST(abort_queue);
if (error != 0) {
@ -1037,7 +1037,7 @@ abort_all_pending(struct targ_softc *softc)
/* If we aborted at least one pending CCB ok, wait for it. */
if (cab.ccb_h.status == CAM_REQ_CMP) {
msleep(&softc->pending_ccb_queue, NULL,
tsleep(&softc->pending_ccb_queue,
PRIBIO | PCATCH, "tgabrt", 0);
}