diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2008-05-19 18:42:14 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2008-05-19 18:42:14 +0000 |
| commit | 5d2ff6359ca4a53dc1c448b39265f3ecd2ed8429 (patch) | |
| tree | 68989f90b67654dca08e3b35f7ba9a6712417e8e /sys/arch/mvme68k/dev | |
| parent | fa629703d5a7a82270cb5b8557a7eb07f52743af (diff) | |
Change all remaining MD uses of MALLOC and FREE into proper malloc() and
free() calls; prodded by chl@, ok krw@
Diffstat (limited to 'sys/arch/mvme68k/dev')
| -rw-r--r-- | sys/arch/mvme68k/dev/ssh.c | 6 | ||||
| -rw-r--r-- | sys/arch/mvme68k/dev/vs.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/mvme68k/dev/ssh.c b/sys/arch/mvme68k/dev/ssh.c index fd35217ec73..babe41225fc 100644 --- a/sys/arch/mvme68k/dev/ssh.c +++ b/sys/arch/mvme68k/dev/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.16 2007/05/29 13:56:13 pyr Exp $ */ +/* $OpenBSD: ssh.c,v 1.17 2008/05/19 18:42:12 miod Exp $ */ /* * Copyright (c) 1994 Michael L. Hitch @@ -500,8 +500,8 @@ sshinitialize(sc) * malloc sc_acb to ensure that DS is on a long word boundary. */ - MALLOC(sc->sc_acb, struct ssh_acb *, - sizeof(struct ssh_acb) * SSH_NACB, M_DEVBUF, M_NOWAIT); + sc->sc_acb = (struct ssh_acb *)malloc(sizeof(struct ssh_acb) * + SSH_NACB, M_DEVBUF, M_NOWAIT); if (sc->sc_acb == NULL) panic("sshinitialize: ACB malloc failed!"); diff --git a/sys/arch/mvme68k/dev/vs.c b/sys/arch/mvme68k/dev/vs.c index 00089708651..30edbf054f9 100644 --- a/sys/arch/mvme68k/dev/vs.c +++ b/sys/arch/mvme68k/dev/vs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vs.c,v 1.22 2007/10/06 02:18:38 krw Exp $ */ +/* $OpenBSD: vs.c,v 1.23 2008/05/19 18:42:12 miod Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. @@ -360,7 +360,7 @@ vs_scsicmd(xs) cqep->cqe_WORK_QUEUE = slp->target + 1; } - MALLOC(m328_cmd, M328_CMD*, sizeof(M328_CMD), M_DEVBUF, M_WAITOK); + m328_cmd = (M328_CMD*)malloc(sizeof(M328_CMD), M_DEVBUF, M_WAITOK); m328_cmd->xs = xs; if (xs->datalen) { |