diff options
| author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
| commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
| tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/dev/snp | |
| parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
| download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz | |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/dev/snp')
| -rw-r--r-- | sys/dev/snp/snp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c index 34e3e29..8158343 100644 --- a/sys/dev/snp/snp.c +++ b/sys/dev/snp/snp.c @@ -150,7 +150,7 @@ snplwrite(tp, uio, flag) snp = tp->t_sc; while (uio->uio_resid > 0) { ilen = imin(512, uio->uio_resid); - ibuf = malloc(ilen, M_SNP, M_WAITOK); + ibuf = malloc(ilen, M_SNP, 0); error = uiomove(ibuf, ilen, uio); if (error != 0) break; @@ -391,7 +391,7 @@ snpopen(dev, flag, mode, td) make_dev(&snp_cdevsw, minor(dev), UID_ROOT, GID_WHEEL, 0600, "snp%d", dev2unit(dev)); dev->si_drv1 = snp = malloc(sizeof(*snp), M_SNP, - M_WAITOK | M_ZERO); + M_ZERO); snp->snp_unit = dev2unit(dev); } else return (EBUSY); @@ -402,7 +402,7 @@ snpopen(dev, flag, mode, td) */ snp->snp_flags = SNOOP_OPEN; - snp->snp_buf = malloc(SNOOP_MINLEN, M_SNP, M_WAITOK); + snp->snp_buf = malloc(SNOOP_MINLEN, M_SNP, 0); snp->snp_blen = SNOOP_MINLEN; snp->snp_base = 0; snp->snp_len = 0; @@ -480,7 +480,7 @@ snp_down(snp) if (snp->snp_blen != SNOOP_MINLEN) { free(snp->snp_buf, M_SNP); - snp->snp_buf = malloc(SNOOP_MINLEN, M_SNP, M_WAITOK); + snp->snp_buf = malloc(SNOOP_MINLEN, M_SNP, 0); snp->snp_blen = SNOOP_MINLEN; } snp->snp_flags |= SNOOP_DOWN; |
