VFLUSHO -> VDISCARD

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

diff --git a/usr/src/sys/kern/kern_malloc.c b/usr/src/sys/kern/kern_malloc.c
index 4ffcad3..91d6b6e 100644 (file)
--- a/usr/src/sys/kern/kern_malloc.c
+++ b/usr/src/sys/kern/kern_malloc.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)kern_malloc.c       7.12.1.1 (Berkeley) %G%
+ *     @(#)kern_malloc.c       7.17 (Berkeley) %G%

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


@@ -188,7 +188,7 @@ free(addr, type)
        size = 1 << kup->ku_indx;
        if (size > MAXALLOCSAVE) {
                alloc = btokmemx(addr);
        size = 1 << kup->ku_indx;
        if (size > MAXALLOCSAVE) {
                alloc = btokmemx(addr);

-               (void) memfree(&kmempt[alloc], (int)kup->ku_pagecnt, 0);
+               (void) memfree(&kmempt[alloc], (int)kup->ku_pagecnt, 1);

                rmfree(kmemmap, (long)kup->ku_pagecnt, alloc + CLSIZE);
                OUT;
                if (wantkmemmap) {
                rmfree(kmemmap, (long)kup->ku_pagecnt, alloc + CLSIZE);
                OUT;
                if (wantkmemmap) {


@@ -261,6 +261,6 @@ kmeminit()
                bucket[indx].kb_highwat = 5 * bucket[indx].kb_elmpercl;
        }
        for (indx = 0; indx < M_LAST; indx++)
                bucket[indx].kb_highwat = 5 * bucket[indx].kb_elmpercl;
        }
        for (indx = 0; indx < M_LAST; indx++)

-               kmemstats[indx].ks_limit = npg * CLBYTES * 8 / 10;
+               kmemstats[indx].ks_limit = npg * NBPG * 6 / 10;

 #endif
 }
 #endif
 }