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/i4b/layer4 | |
| 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/i4b/layer4')
| -rw-r--r-- | sys/i4b/layer4/i4b_i4bdrv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c index 1dffc0f..95afcc9 100644 --- a/sys/i4b/layer4/i4b_i4bdrv.c +++ b/sys/i4b/layer4/i4b_i4bdrv.c @@ -646,10 +646,10 @@ i4bioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td) } prots = malloc(r->numprotos * sizeof(struct isdn_dr_prot), - M_DEVBUF, M_WAITOK); + M_DEVBUF, 0); prots2 = malloc(r->numprotos * sizeof(struct isdn_dr_prot), - M_DEVBUF, M_WAITOK); + M_DEVBUF, 0); if(!prots || !prots2) { @@ -661,7 +661,7 @@ i4bioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td) for(i = 0; i < r->numprotos; i++) { - prots2[i].microcode = malloc(prots[i].bytecount, M_DEVBUF, M_WAITOK); + prots2[i].microcode = malloc(prots[i].bytecount, M_DEVBUF, 0); copyin(prots[i].microcode, prots2[i].microcode, prots[i].bytecount); prots2[i].bytecount = prots[i].bytecount; } @@ -721,7 +721,7 @@ download_done: goto diag_done; } - req.in_param = malloc(r->in_param_len, M_DEVBUF, M_WAITOK); + req.in_param = malloc(r->in_param_len, M_DEVBUF, 0); if(!req.in_param) { @@ -735,7 +735,7 @@ download_done: if(req.out_param_len) { - req.out_param = malloc(r->out_param_len, M_DEVBUF, M_WAITOK); + req.out_param = malloc(r->out_param_len, M_DEVBUF, 0); if(!req.out_param) { |
