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 24d979b..190bc8a 100644 (file)
--- 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.
 
 /*
  * Tahoe VERSAbus adapator support routines.


@@ -20,6 +20,7 @@
 #include "vmmac.h"
 #include "proc.h"
 #include "syslog.h"
 #include "vmmac.h"
 #include "proc.h"
 #include "syslog.h"

+#include "malloc.h"

 
 #include "../tahoevba/vbavar.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)
        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);
        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 e63af6c..d4b0916 100644 (file)
--- 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.
  *
  * 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 "buf.h"
 #include "dkstat.h"
 #include "vm.h"

+#include "malloc.h"

 #include "conf.h"
 #include "dmap.h"
 #include "reboot.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
         */
         * 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);
 
        /*
        ubainitmaps(uhp);
 
        /*


@@ -651,7 +653,7 @@ unifind(uhp0, pumem)
         */
 #if    VAX8600
        if (cpu == VAX_8600)
         */
 #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)
        else
 #endif
        if (numuba == 0)


@@ -660,7 +662,7 @@ unifind(uhp0, pumem)
        else if (numuba == 1)
                uhp->uh_vec = UNI1vec;
        else
        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] =
 #endif
        for (i = 0; i < 128; i++)
                uhp->uh_vec[i] =