Use M_IOBUF instead of M_TEMP for malloc'd buffers.

[unix-history] / sys / kern / kern_malloc.c

diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 59bbc0f..63a3bb0 100644 (file)
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -31,10 +31,11 @@
  * SUCH DAMAGE.
  *
  *     from: @(#)kern_malloc.c 7.25 (Berkeley) 5/8/91
  * SUCH DAMAGE.
  *
  *     from: @(#)kern_malloc.c 7.25 (Berkeley) 5/8/91

- *     $Id: kern_malloc.c,v 1.3 1993/10/18 03:46:54 davidg Exp $
+ *     $Id: kern_malloc.c,v 1.5 1993/11/25 01:33:02 wollman Exp $

  */
 
 #include "param.h"
  */
 
 #include "param.h"

+#include "systm.h"

 #include "proc.h"
 #include "kernel.h"
 #include "malloc.h"
 #include "proc.h"
 #include "kernel.h"
 #include "malloc.h"


@@ -224,18 +225,19 @@ free(addr, type)
 /*
  * Initialize the kernel memory allocator
  */
 /*
  * Initialize the kernel memory allocator
  */

+void

 kmeminit()
 {
        register long indx;
        int npg;
 
 #if    (MAXALLOCSAVE > MINALLOCSIZE * 32768)
 kmeminit()
 {
        register long indx;
        int npg;
 
 #if    (MAXALLOCSAVE > MINALLOCSIZE * 32768)

-               ERROR!_kmeminit:_MAXALLOCSAVE_too_big
+#  error "kmeminit: MAXALLOCSAVE too big"

 #endif
 #if    (MAXALLOCSAVE < CLBYTES-1)
 #endif
 #if    (MAXALLOCSAVE < CLBYTES-1)

-               ERROR!_kmeminit:_MAXALLOCSAVE_too_small
+#  error "kmeminit: MAXALLOCSAVE too small"

 #endif
 #endif

-       npg = VM_KMEM_SIZE/ NBPG;
+       npg = (VM_KMEM_SIZE + VM_MBUF_SIZE) / NBPG;

        kmemusage = (struct kmemusage *) kmem_alloc(kernel_map,
                (vm_size_t)(npg * sizeof(struct kmemusage)));
        kmem_map = kmem_suballoc(kernel_map, (vm_offset_t *)&kmembase,
        kmemusage = (struct kmemusage *) kmem_alloc(kernel_map,
                (vm_size_t)(npg * sizeof(struct kmemusage)));
        kmem_map = kmem_suballoc(kernel_map, (vm_offset_t *)&kmembase,