summaryrefslogtreecommitdiffstats
path: root/sys/i4b/layer4
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2003-02-19 05:47:46 +0000
committerimp <imp@FreeBSD.org>2003-02-19 05:47:46 +0000
commitcf874b345d0f766fb64cf4737e1c85ccc78d2bee (patch)
tree9e20e320fe15ae4bf68f8335fcf9d3e71d3b3614 /sys/i4b/layer4
parentb72619cecb8265d3efb3781b0acff1380762c173 (diff)
downloadFreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.zip
FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.tar.gz
Back out M_* changes, per decision of the TRB.
Approved by: trb
Diffstat (limited to 'sys/i4b/layer4')
-rw-r--r--sys/i4b/layer4/i4b_i4bdrv.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index 95afcc9..1dffc0f 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, 0);
+ M_DEVBUF, M_WAITOK);
prots2 = malloc(r->numprotos * sizeof(struct isdn_dr_prot),
- M_DEVBUF, 0);
+ M_DEVBUF, M_WAITOK);
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, 0);
+ prots2[i].microcode = malloc(prots[i].bytecount, M_DEVBUF, M_WAITOK);
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, 0);
+ req.in_param = malloc(r->in_param_len, M_DEVBUF, M_WAITOK);
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, 0);
+ req.out_param = malloc(r->out_param_len, M_DEVBUF, M_WAITOK);
if(!req.out_param)
{
OpenPOWER on IntegriCloud