From: Kirk McKusick <mckusick@ucbvax.Berkeley.EDU>
Date: Sun, 7 Jun 1987 06:10:36 +0000 (-0800)
Subject: calloc => malloc
X-Git-Tag: BSD-4_3_Net_1-Snapshot-Development~4373
X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/fcba03fbbdfc4620779226dc07de91228431d226

calloc => malloc

SCCS-vsn: sys/vax/vax/autoconf.c 7.7
SCCS-vsn: sys/tahoe/vba/vba.c 1.8
SCCS-vsn: sys/vax/vax/autoconf.c 7.7
---

diff --git a/usr/src/sys/tahoe/vba/vba.c b/usr/src/sys/tahoe/vba/vba.c
index 24d979bed8..190bc8a0c1 100644
--- a/usr/src/sys/tahoe/vba/vba.c
+++ b/usr/src/sys/tahoe/vba/vba.c
@@ -1,4 +1,4 @@
-/*	vba.c	1.7	87/04/06	*/
+/*	vba.c	1.8	87/06/06	*/
 
 /*
  * Tahoe VERSAbus adapator support routines.
@@ -20,6 +20,7 @@
 #include "vmmac.h"
 #include "proc.h"
 #include "syslog.h"
+#include "malloc.h"
 
 #include "../tahoevba/vbavar.h"
 
@@ -43,7 +44,7 @@ vbainit(vb, xsize, flags)
 	n = roundup(xsize, NBPG);
 	vb->vb_bufsize = n;
 	if (vb->vb_rawbuf == 0)
-		vb->vb_rawbuf = calloc(n);
+		vb->vb_rawbuf = (caddr_t)malloc(n, M_DEVBUF, M_NOWAIT);
 	if ((int)vb->vb_rawbuf & PGOFSET)
 		panic("vbinit pgoff");
 	vb->vb_physbuf = vtoph((struct proc *)0, vb->vb_rawbuf);
diff --git a/usr/src/sys/vax/vax/autoconf.c b/usr/src/sys/vax/vax/autoconf.c
index e63af6c31f..d4b0916591 100644
--- a/usr/src/sys/vax/vax/autoconf.c
+++ b/usr/src/sys/vax/vax/autoconf.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
- *	@(#)autoconf.c	7.6 (Berkeley) %G%
+ *	@(#)autoconf.c	7.7 (Berkeley) %G%
  */
 
 /*
@@ -24,6 +24,7 @@
 #include "buf.h"
 #include "dkstat.h"
 #include "vm.h"
+#include "malloc.h"
 #include "conf.h"
 #include "dmap.h"
 #include "reboot.h"
@@ -640,7 +641,8 @@ unifind(uhp0, pumem)
 	 * Initialize the UNIBUS, by freeing the map
 	 * registers and the buffered data path registers
 	 */
-	uhp->uh_map = (struct map *)calloc(UAMSIZ * sizeof (struct map));
+	uhp->uh_map = (struct map *)
+		malloc(UAMSIZ * sizeof (struct map), M_DEVBUF, M_NOWAIT);
 	ubainitmaps(uhp);
 
 	/*
@@ -651,7 +653,7 @@ unifind(uhp0, pumem)
 	 */
 #if	VAX8600
 	if (cpu == VAX_8600)
-		uhp->uh_vec = (int(**)())calloc(512);
+		uhp->uh_vec = (int(**)())malloc(512, M_DEVBUF, M_NOWAIT);
 	else
 #endif
 	if (numuba == 0)
@@ -660,7 +662,7 @@ unifind(uhp0, pumem)
 	else if (numuba == 1)
 		uhp->uh_vec = UNI1vec;
 	else
-		uhp->uh_vec = (int(**)())calloc(512);
+		uhp->uh_vec = (int(**)())malloc(512, M_DEVBUF, M_NOWAIT);
 #endif
 	for (i = 0; i < 128; i++)
 		uhp->uh_vec[i] =