Module Name: src
Committed By: ad
Date: Tue Dec 31 13:07:14 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: arc.c
src/sys/arch/alpha/alpha: machdep.c
src/sys/arch/atari/atari: machdep.c
src/sys/arch/cesfic/cesfic: machdep.c
src/sys/arch/emips/emips: machdep.c
src/sys/arch/evbppc/explora: machdep.c
src/sys/arch/evbppc/virtex: machdep.c
src/sys/arch/evbppc/walnut: machdep.c
src/sys/arch/ews4800mips/ews4800mips: machdep.c
src/sys/arch/hp300/hp300: machdep.c
src/sys/arch/hppa/hppa: machdep.c
src/sys/arch/luna68k/luna68k: machdep.c
src/sys/arch/mac68k/mac68k: machdep.c
src/sys/arch/mips/mips: cpu_subr.c
src/sys/arch/mvme68k/mvme68k: machdep.c
src/sys/arch/news68k/news68k: machdep.c
src/sys/arch/next68k/next68k: machdep.c
src/sys/arch/powerpc/booke: booke_machdep.c
src/sys/arch/powerpc/ibm4xx: ibm4xx_machdep.c
src/sys/arch/powerpc/oea: oea_machdep.c
src/sys/arch/riscv/riscv: riscv_machdep.c
src/sys/arch/sgimips/sgimips: machdep.c
src/sys/arch/sh3/sh3: sh3_machdep.c
src/sys/arch/sparc/sparc: machdep.c
src/sys/arch/sparc64/sparc64: machdep.c
src/sys/arch/sun2/sun2: machdep.c
src/sys/arch/sun3/sun3: machdep.c
src/sys/arch/sun3/sun3x: machdep.c
src/sys/arch/vax/vax: machdep.c
src/sys/arch/x68k/x68k: machdep.c
src/sys/compat/linux/common: linux_misc.c
src/sys/compat/linux32/common: linux32_sysinfo.c
src/sys/dev: ccd.c
src/sys/fs/tmpfs: tmpfs_mem.c
src/sys/kern: init_main.c kern_module.c kern_proc.c vfs_bio.c
src/sys/miscfs/procfs: procfs_linux.c
src/sys/rump/librump/rumpkern: vm.c
src/sys/ufs/chfs: chfs_subr.c
src/sys/ufs/lfs: lfs_bio.c
src/sys/uvm: uvm_extern.h uvm_glue.c uvm_meter.c uvm_page.c
uvm_pdaemon.c uvm_pdpolicy_clock.c uvm_pglist.c uvm_stat.c
Log Message:
Rename uvm_free() -> uvm_availmem().
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c
cvs rdiff -u -r1.356 -r1.357 src/sys/arch/alpha/alpha/machdep.c
cvs rdiff -u -r1.181 -r1.182 src/sys/arch/atari/atari/machdep.c
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/cesfic/cesfic/machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/emips/emips/machdep.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbppc/explora/machdep.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbppc/virtex/machdep.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/evbppc/walnut/machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/ews4800mips/ews4800mips/machdep.c
cvs rdiff -u -r1.231 -r1.232 src/sys/arch/hp300/hp300/machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hppa/hppa/machdep.c
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/luna68k/luna68k/machdep.c
cvs rdiff -u -r1.356 -r1.357 src/sys/arch/mac68k/mac68k/machdep.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/mips/mips/cpu_subr.c
cvs rdiff -u -r1.156 -r1.157 src/sys/arch/mvme68k/mvme68k/machdep.c
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/news68k/news68k/machdep.c
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/next68k/next68k/machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/booke/booke_machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/powerpc/oea/oea_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/riscv/riscv/riscv_machdep.c
cvs rdiff -u -r1.148 -r1.149 src/sys/arch/sgimips/sgimips/machdep.c
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/sh3/sh3/sh3_machdep.c
cvs rdiff -u -r1.332 -r1.333 src/sys/arch/sparc/sparc/machdep.c
cvs rdiff -u -r1.296 -r1.297 src/sys/arch/sparc64/sparc64/machdep.c
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/sun2/sun2/machdep.c
cvs rdiff -u -r1.210 -r1.211 src/sys/arch/sun3/sun3/machdep.c
cvs rdiff -u -r1.137 -r1.138 src/sys/arch/sun3/sun3x/machdep.c
cvs rdiff -u -r1.194 -r1.195 src/sys/arch/vax/vax/machdep.c
cvs rdiff -u -r1.201 -r1.202 src/sys/arch/x68k/x68k/machdep.c
cvs rdiff -u -r1.246 -r1.247 src/sys/compat/linux/common/linux_misc.c
cvs rdiff -u -r1.9 -r1.10 src/sys/compat/linux32/common/linux32_sysinfo.c
cvs rdiff -u -r1.182 -r1.183 src/sys/dev/ccd.c
cvs rdiff -u -r1.11 -r1.12 src/sys/fs/tmpfs/tmpfs_mem.c
cvs rdiff -u -r1.513 -r1.514 src/sys/kern/init_main.c
cvs rdiff -u -r1.142 -r1.143 src/sys/kern/kern_module.c
cvs rdiff -u -r1.238 -r1.239 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.285 -r1.286 src/sys/kern/vfs_bio.c
cvs rdiff -u -r1.78 -r1.79 src/sys/miscfs/procfs/procfs_linux.c
cvs rdiff -u -r1.178 -r1.179 src/sys/rump/librump/rumpkern/vm.c
cvs rdiff -u -r1.10 -r1.11 src/sys/ufs/chfs/chfs_subr.c
cvs rdiff -u -r1.143 -r1.144 src/sys/ufs/lfs/lfs_bio.c
cvs rdiff -u -r1.216 -r1.217 src/sys/uvm/uvm_extern.h
cvs rdiff -u -r1.173 -r1.174 src/sys/uvm/uvm_glue.c
cvs rdiff -u -r1.72 -r1.73 src/sys/uvm/uvm_meter.c
cvs rdiff -u -r1.218 -r1.219 src/sys/uvm/uvm_page.c
cvs rdiff -u -r1.120 -r1.121 src/sys/uvm/uvm_pdaemon.c
cvs rdiff -u -r1.26 -r1.27 src/sys/uvm/uvm_pdpolicy_clock.c
cvs rdiff -u -r1.78 -r1.79 src/sys/uvm/uvm_pglist.c
cvs rdiff -u -r1.42 -r1.43 src/sys/uvm/uvm_stat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.17 src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.18
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.17 Sat Dec 21 13:00:20 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c Tue Dec 31 13:07:09 2019
@@ -283,9 +283,9 @@ int arc_procfd;
#ifndef ptob
#define ptob(x) ((x) * PAGE_SIZE)
#endif
-//#define needfree (uvm_free() < uvmexp.freetarg ? uvmexp.freetarg : 0)
+//#define needfree (uvm_availmem() < uvmexp.freetarg ? uvmexp.freetarg : 0)
#define buf_init arc_buf_init
-#define freemem uvm_free()
+#define freemem uvm_availmem()
#define minfree uvmexp.freemin
#define desfree uvmexp.freetarg
#define lotsfree (desfree * 2)
Index: src/sys/arch/alpha/alpha/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.356 src/sys/arch/alpha/alpha/machdep.c:1.357
--- src/sys/arch/alpha/alpha/machdep.c:1.356 Sat Dec 21 13:00:20 2019
+++ src/sys/arch/alpha/alpha/machdep.c Tue Dec 31 13:07:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.356 2019/12/21 13:00:20 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.357 2019/12/31 13:07:09 ad Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2019 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.356 2019/12/21 13:00:20 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.357 2019/12/31 13:07:09 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -868,7 +868,7 @@ cpu_startup(void)
#if defined(DEBUG)
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
#if 0
{
Index: src/sys/arch/atari/atari/machdep.c
diff -u src/sys/arch/atari/atari/machdep.c:1.181 src/sys/arch/atari/atari/machdep.c:1.182
--- src/sys/arch/atari/atari/machdep.c:1.181 Sat Dec 21 13:00:21 2019
+++ src/sys/arch/atari/atari/machdep.c Tue Dec 31 13:07:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.181 2019/12/21 13:00:21 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.182 2019/12/31 13:07:09 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.181 2019/12/21 13:00:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.182 2019/12/31 13:07:09 ad Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -211,7 +211,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/cesfic/cesfic/machdep.c
diff -u src/sys/arch/cesfic/cesfic/machdep.c:1.69 src/sys/arch/cesfic/cesfic/machdep.c:1.70
--- src/sys/arch/cesfic/cesfic/machdep.c:1.69 Sat Dec 21 13:00:21 2019
+++ src/sys/arch/cesfic/cesfic/machdep.c Tue Dec 31 13:07:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.69 2019/12/21 13:00:21 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.70 2019/12/31 13:07:10 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.69 2019/12/21 13:00:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.70 2019/12/31 13:07:10 ad Exp $");
#include "opt_bufcache.h"
#include "opt_ddb.h"
@@ -260,7 +260,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- printf("avail mem = %ld\n", ptoa(uvm_free()));
+ printf("avail mem = %ld\n", ptoa(uvm_availmem()));
}
/*
Index: src/sys/arch/emips/emips/machdep.c
diff -u src/sys/arch/emips/emips/machdep.c:1.14 src/sys/arch/emips/emips/machdep.c:1.15
--- src/sys/arch/emips/emips/machdep.c:1.14 Sat Dec 21 13:00:21 2019
+++ src/sys/arch/emips/emips/machdep.c Tue Dec 31 13:07:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.14 2019/12/21 13:00:21 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.15 2019/12/31 13:07:10 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2019/12/21 13:00:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.15 2019/12/31 13:07:10 ad Exp $");
#include "opt_ddb.h"
@@ -458,7 +458,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/evbppc/explora/machdep.c
diff -u src/sys/arch/evbppc/explora/machdep.c:1.38 src/sys/arch/evbppc/explora/machdep.c:1.39
--- src/sys/arch/evbppc/explora/machdep.c:1.38 Sat Dec 21 13:00:21 2019
+++ src/sys/arch/evbppc/explora/machdep.c Tue Dec 31 13:07:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.38 2019/12/21 13:00:21 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.39 2019/12/31 13:07:10 ad Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38 2019/12/21 13:00:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.39 2019/12/31 13:07:10 ad Exp $");
#include "opt_explora.h"
#include "opt_modular.h"
@@ -179,7 +179,7 @@ cpu_startup(void)
* pool pages.
*/
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/evbppc/virtex/machdep.c
diff -u src/sys/arch/evbppc/virtex/machdep.c:1.23 src/sys/arch/evbppc/virtex/machdep.c:1.24
--- src/sys/arch/evbppc/virtex/machdep.c:1.23 Sat Dec 21 13:00:21 2019
+++ src/sys/arch/evbppc/virtex/machdep.c Tue Dec 31 13:07:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.23 2019/12/21 13:00:21 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.24 2019/12/31 13:07:10 ad Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.23 2019/12/21 13:00:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.24 2019/12/31 13:07:10 ad Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -202,7 +202,7 @@ cpu_startup(void)
* pool pages.
*/
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/evbppc/walnut/machdep.c
diff -u src/sys/arch/evbppc/walnut/machdep.c:1.57 src/sys/arch/evbppc/walnut/machdep.c:1.58
--- src/sys/arch/evbppc/walnut/machdep.c:1.57 Sat Dec 21 13:00:21 2019
+++ src/sys/arch/evbppc/walnut/machdep.c Tue Dec 31 13:07:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.57 2019/12/21 13:00:21 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.58 2019/12/31 13:07:10 ad Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.57 2019/12/21 13:00:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.58 2019/12/31 13:07:10 ad Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -259,7 +259,7 @@ cpu_startup(void)
* pool pages.
*/
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/ews4800mips/ews4800mips/machdep.c
diff -u src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.29 src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.30
--- src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.29 Sat Dec 21 13:00:21 2019
+++ src/sys/arch/ews4800mips/ews4800mips/machdep.c Tue Dec 31 13:07:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.29 2019/12/21 13:00:21 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.30 2019/12/31 13:07:10 ad Exp $ */
/*-
* Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 2019/12/21 13:00:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.30 2019/12/31 13:07:10 ad Exp $");
#include "opt_ddb.h"
@@ -230,7 +230,7 @@ cpu_startup(void)
* are allocated via the pool allocator, and we use KSEG to
* map those pages.)
*/
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/hp300/hp300/machdep.c
diff -u src/sys/arch/hp300/hp300/machdep.c:1.231 src/sys/arch/hp300/hp300/machdep.c:1.232
--- src/sys/arch/hp300/hp300/machdep.c:1.231 Sat Dec 21 13:00:21 2019
+++ src/sys/arch/hp300/hp300/machdep.c Tue Dec 31 13:07:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.231 2019/12/21 13:00:21 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.232 2019/12/31 13:07:10 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.231 2019/12/21 13:00:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.232 2019/12/31 13:07:10 ad Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -324,7 +324,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/hppa/hppa/machdep.c
diff -u src/sys/arch/hppa/hppa/machdep.c:1.11 src/sys/arch/hppa/hppa/machdep.c:1.12
--- src/sys/arch/hppa/hppa/machdep.c:1.11 Sat Dec 21 13:00:21 2019
+++ src/sys/arch/hppa/hppa/machdep.c Tue Dec 31 13:07:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.11 2019/12/21 13:00:21 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.12 2019/12/31 13:07:10 ad Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.11 2019/12/21 13:00:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.12 2019/12/31 13:07:10 ad Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@@ -943,7 +943,7 @@ cpu_startup(void)
#ifdef PMAPDEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf[0], sizeof(pbuf[0]), ptoa(uvm_free()));
+ format_bytes(pbuf[0], sizeof(pbuf[0]), ptoa(uvm_availmem()));
printf("avail mem = %s\n", pbuf[0]);
}
Index: src/sys/arch/luna68k/luna68k/machdep.c
diff -u src/sys/arch/luna68k/luna68k/machdep.c:1.104 src/sys/arch/luna68k/luna68k/machdep.c:1.105
--- src/sys/arch/luna68k/luna68k/machdep.c:1.104 Sat Dec 21 13:00:22 2019
+++ src/sys/arch/luna68k/luna68k/machdep.c Tue Dec 31 13:07:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.104 2019/12/21 13:00:22 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.105 2019/12/31 13:07:10 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.104 2019/12/21 13:00:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.105 2019/12/31 13:07:10 ad Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -345,7 +345,7 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/mac68k/mac68k/machdep.c
diff -u src/sys/arch/mac68k/mac68k/machdep.c:1.356 src/sys/arch/mac68k/mac68k/machdep.c:1.357
--- src/sys/arch/mac68k/mac68k/machdep.c:1.356 Sat Dec 21 13:00:22 2019
+++ src/sys/arch/mac68k/mac68k/machdep.c Tue Dec 31 13:07:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.356 2019/12/21 13:00:22 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.357 2019/12/31 13:07:11 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.356 2019/12/21 13:00:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.357 2019/12/31 13:07:11 ad Exp $");
#include "opt_adb.h"
#include "opt_copy_symtab.h"
@@ -414,7 +414,7 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/mips/mips/cpu_subr.c
diff -u src/sys/arch/mips/mips/cpu_subr.c:1.43 src/sys/arch/mips/mips/cpu_subr.c:1.44
--- src/sys/arch/mips/mips/cpu_subr.c:1.43 Fri Dec 27 09:45:26 2019
+++ src/sys/arch/mips/mips/cpu_subr.c Tue Dec 31 13:07:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_subr.c,v 1.43 2019/12/27 09:45:26 msaitoh Exp $ */
+/* $NetBSD: cpu_subr.c,v 1.44 2019/12/31 13:07:11 ad Exp $ */
/*-
* Copyright (c) 2010, 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.43 2019/12/27 09:45:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.44 2019/12/31 13:07:11 ad Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@@ -337,7 +337,7 @@ cpu_startup_common(void)
* map those pages.)
*/
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
#if defined(__mips_n32)
Index: src/sys/arch/mvme68k/mvme68k/machdep.c
diff -u src/sys/arch/mvme68k/mvme68k/machdep.c:1.156 src/sys/arch/mvme68k/mvme68k/machdep.c:1.157
--- src/sys/arch/mvme68k/mvme68k/machdep.c:1.156 Sat Dec 21 13:00:22 2019
+++ src/sys/arch/mvme68k/mvme68k/machdep.c Tue Dec 31 13:07:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.156 2019/12/21 13:00:22 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.157 2019/12/31 13:07:11 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.156 2019/12/21 13:00:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.157 2019/12/31 13:07:11 ad Exp $");
#include "opt_ddb.h"
#include "opt_m060sp.h"
@@ -474,7 +474,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/news68k/news68k/machdep.c
diff -u src/sys/arch/news68k/news68k/machdep.c:1.105 src/sys/arch/news68k/news68k/machdep.c:1.106
--- src/sys/arch/news68k/news68k/machdep.c:1.105 Sat Dec 21 13:00:22 2019
+++ src/sys/arch/news68k/news68k/machdep.c Tue Dec 31 13:07:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.105 2019/12/21 13:00:22 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.106 2019/12/31 13:07:11 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.105 2019/12/21 13:00:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.106 2019/12/31 13:07:11 ad Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -237,7 +237,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/next68k/next68k/machdep.c
diff -u src/sys/arch/next68k/next68k/machdep.c:1.113 src/sys/arch/next68k/next68k/machdep.c:1.114
--- src/sys/arch/next68k/next68k/machdep.c:1.113 Sat Dec 21 13:00:22 2019
+++ src/sys/arch/next68k/next68k/machdep.c Tue Dec 31 13:07:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.113 2019/12/21 13:00:22 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.114 2019/12/31 13:07:11 ad Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.113 2019/12/21 13:00:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.114 2019/12/31 13:07:11 ad Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -303,7 +303,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/powerpc/booke/booke_machdep.c
diff -u src/sys/arch/powerpc/booke/booke_machdep.c:1.28 src/sys/arch/powerpc/booke/booke_machdep.c:1.29
--- src/sys/arch/powerpc/booke/booke_machdep.c:1.28 Fri Dec 27 09:45:26 2019
+++ src/sys/arch/powerpc/booke/booke_machdep.c Tue Dec 31 13:07:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: booke_machdep.c,v 1.28 2019/12/27 09:45:26 msaitoh Exp $ */
+/* $NetBSD: booke_machdep.c,v 1.29 2019/12/31 13:07:11 ad Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,7 +38,7 @@
#define _POWERPC_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: booke_machdep.c,v 1.28 2019/12/27 09:45:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_machdep.c,v 1.29 2019/12/31 13:07:11 ad Exp $");
#include "opt_modular.h"
@@ -191,7 +191,7 @@ booke_cpu_startup(const char *model)
* pool pages.
*/
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
diff -u src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.27 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.28
--- src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.27 Sat Dec 21 13:00:22 2019
+++ src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c Tue Dec 31 13:07:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ibm4xx_machdep.c,v 1.27 2019/12/21 13:00:22 ad Exp $ */
+/* $NetBSD: ibm4xx_machdep.c,v 1.28 2019/12/31 13:07:11 ad Exp $ */
/* Original: ibm40x_machdep.c,v 1.3 2005/01/17 17:19:36 shige Exp $ */
/*
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.27 2019/12/21 13:00:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.28 2019/12/31 13:07:11 ad Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -307,7 +307,7 @@ ibm4xx_cpu_startup(const char *model)
* pool pages.
*/
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/powerpc/oea/oea_machdep.c
diff -u src/sys/arch/powerpc/oea/oea_machdep.c:1.77 src/sys/arch/powerpc/oea/oea_machdep.c:1.78
--- src/sys/arch/powerpc/oea/oea_machdep.c:1.77 Sat Dec 21 13:00:22 2019
+++ src/sys/arch/powerpc/oea/oea_machdep.c Tue Dec 31 13:07:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: oea_machdep.c,v 1.77 2019/12/21 13:00:22 ad Exp $ */
+/* $NetBSD: oea_machdep.c,v 1.78 2019/12/31 13:07:11 ad Exp $ */
/*
* Copyright (C) 2002 Matt Thomas
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.77 2019/12/21 13:00:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.78 2019/12/31 13:07:11 ad Exp $");
#include "opt_ppcarch.h"
#include "opt_compat_netbsd.h"
@@ -1000,7 +1000,7 @@ oea_startup(const char *model)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
#ifdef MULTIPROCESSOR
Index: src/sys/arch/riscv/riscv/riscv_machdep.c
diff -u src/sys/arch/riscv/riscv/riscv_machdep.c:1.7 src/sys/arch/riscv/riscv/riscv_machdep.c:1.8
--- src/sys/arch/riscv/riscv/riscv_machdep.c:1.7 Sat Dec 21 13:00:23 2019
+++ src/sys/arch/riscv/riscv/riscv_machdep.c Tue Dec 31 13:07:12 2019
@@ -31,7 +31,7 @@
#include "opt_modular.h"
-__RCSID("$NetBSD: riscv_machdep.c,v 1.7 2019/12/21 13:00:23 ad Exp $");
+__RCSID("$NetBSD: riscv_machdep.c,v 1.8 2019/12/31 13:07:12 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -326,7 +326,7 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, FALSE, NULL);
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/sgimips/sgimips/machdep.c
diff -u src/sys/arch/sgimips/sgimips/machdep.c:1.148 src/sys/arch/sgimips/sgimips/machdep.c:1.149
--- src/sys/arch/sgimips/sgimips/machdep.c:1.148 Sat Dec 21 13:00:23 2019
+++ src/sys/arch/sgimips/sgimips/machdep.c Tue Dec 31 13:07:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.148 2019/12/21 13:00:23 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.149 2019/12/31 13:07:12 ad Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.148 2019/12/21 13:00:23 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.149 2019/12/31 13:07:12 ad Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -730,7 +730,7 @@ cpu_startup(void)
* are allocated via the pool allocator, and we use KSEG to
* map those pages.)
*/
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/sh3/sh3/sh3_machdep.c
diff -u src/sys/arch/sh3/sh3/sh3_machdep.c:1.108 src/sys/arch/sh3/sh3/sh3_machdep.c:1.109
--- src/sys/arch/sh3/sh3/sh3_machdep.c:1.108 Sat Dec 21 13:00:23 2019
+++ src/sys/arch/sh3/sh3/sh3_machdep.c Tue Dec 31 13:07:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sh3_machdep.c,v 1.108 2019/12/21 13:00:23 ad Exp $ */
+/* $NetBSD: sh3_machdep.c,v 1.109 2019/12/31 13:07:12 ad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.108 2019/12/21 13:00:23 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.109 2019/12/31 13:07:12 ad Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -304,7 +304,7 @@ sh_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/sparc/sparc/machdep.c
diff -u src/sys/arch/sparc/sparc/machdep.c:1.332 src/sys/arch/sparc/sparc/machdep.c:1.333
--- src/sys/arch/sparc/sparc/machdep.c:1.332 Sat Dec 21 13:00:23 2019
+++ src/sys/arch/sparc/sparc/machdep.c Tue Dec 31 13:07:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.332 2019/12/21 13:00:23 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.333 2019/12/31 13:07:12 ad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.332 2019/12/21 13:00:23 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.333 2019/12/31 13:07:12 ad Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_sunos.h"
@@ -322,7 +322,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
pmap_redzone();
Index: src/sys/arch/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.296 src/sys/arch/sparc64/sparc64/machdep.c:1.297
--- src/sys/arch/sparc64/sparc64/machdep.c:1.296 Sat Dec 21 13:00:23 2019
+++ src/sys/arch/sparc64/sparc64/machdep.c Tue Dec 31 13:07:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.296 2019/12/21 13:00:23 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.297 2019/12/31 13:07:12 ad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2019 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.296 2019/12/21 13:00:23 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.297 2019/12/31 13:07:12 ad Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -195,7 +195,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
#if 0
Index: src/sys/arch/sun2/sun2/machdep.c
diff -u src/sys/arch/sun2/sun2/machdep.c:1.79 src/sys/arch/sun2/sun2/machdep.c:1.80
--- src/sys/arch/sun2/sun2/machdep.c:1.79 Sat Dec 21 13:00:23 2019
+++ src/sys/arch/sun2/sun2/machdep.c Tue Dec 31 13:07:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.79 2019/12/21 13:00:23 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.80 2019/12/31 13:07:12 ad Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -149,7 +149,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.79 2019/12/21 13:00:23 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.80 2019/12/31 13:07:12 ad Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -336,7 +336,7 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/sun3/sun3/machdep.c
diff -u src/sys/arch/sun3/sun3/machdep.c:1.210 src/sys/arch/sun3/sun3/machdep.c:1.211
--- src/sys/arch/sun3/sun3/machdep.c:1.210 Sat Dec 21 13:00:23 2019
+++ src/sys/arch/sun3/sun3/machdep.c Tue Dec 31 13:07:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.210 2019/12/21 13:00:23 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.211 2019/12/31 13:07:12 ad Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.210 2019/12/21 13:00:23 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.211 2019/12/31 13:07:12 ad Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -258,7 +258,7 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/sun3/sun3x/machdep.c
diff -u src/sys/arch/sun3/sun3x/machdep.c:1.137 src/sys/arch/sun3/sun3x/machdep.c:1.138
--- src/sys/arch/sun3/sun3x/machdep.c:1.137 Sat Dec 21 13:00:23 2019
+++ src/sys/arch/sun3/sun3x/machdep.c Tue Dec 31 13:07:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.137 2019/12/21 13:00:23 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.138 2019/12/31 13:07:12 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.137 2019/12/21 13:00:23 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.138 2019/12/31 13:07:12 ad Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -221,7 +221,7 @@ cpu_startup(void)
phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
VM_PHYS_SIZE, 0, false, NULL);
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/vax/vax/machdep.c
diff -u src/sys/arch/vax/vax/machdep.c:1.194 src/sys/arch/vax/vax/machdep.c:1.195
--- src/sys/arch/vax/vax/machdep.c:1.194 Sat Dec 21 13:00:24 2019
+++ src/sys/arch/vax/vax/machdep.c Tue Dec 31 13:07:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.194 2019/12/21 13:00:24 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.195 2019/12/31 13:07:12 ad Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.194 2019/12/21 13:00:24 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.195 2019/12/31 13:07:12 ad Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -205,7 +205,7 @@ cpu_startup(void)
VM_PHYS_SIZE, 0, false, NULL);
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
#ifdef DDB
Index: src/sys/arch/x68k/x68k/machdep.c
diff -u src/sys/arch/x68k/x68k/machdep.c:1.201 src/sys/arch/x68k/x68k/machdep.c:1.202
--- src/sys/arch/x68k/x68k/machdep.c:1.201 Sat Dec 21 13:00:24 2019
+++ src/sys/arch/x68k/x68k/machdep.c Tue Dec 31 13:07:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.201 2019/12/21 13:00:24 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.202 2019/12/31 13:07:13 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.201 2019/12/21 13:00:24 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.202 2019/12/31 13:07:13 ad Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -299,7 +299,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_availmem()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/compat/linux/common/linux_misc.c
diff -u src/sys/compat/linux/common/linux_misc.c:1.246 src/sys/compat/linux/common/linux_misc.c:1.247
--- src/sys/compat/linux/common/linux_misc.c:1.246 Sat Dec 21 13:00:24 2019
+++ src/sys/compat/linux/common/linux_misc.c Tue Dec 31 13:07:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.c,v 1.246 2019/12/21 13:00:24 ad Exp $ */
+/* $NetBSD: linux_misc.c,v 1.247 2019/12/31 13:07:13 ad Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.246 2019/12/21 13:00:24 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.247 2019/12/31 13:07:13 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1354,7 +1354,7 @@ linux_sys_sysinfo(struct lwp *l, const s
si.loads[1] = la->ldavg[1] * LINUX_SYSINFO_LOADS_SCALE / la->fscale;
si.loads[2] = la->ldavg[2] * LINUX_SYSINFO_LOADS_SCALE / la->fscale;
si.totalram = ctob((u_long)physmem);
- si.freeram = (u_long)uvm_free() * uvmexp.pagesize;
+ si.freeram = (u_long)uvm_availmem() * uvmexp.pagesize;
si.sharedram = 0; /* XXX */
si.bufferram = (u_long)uvmexp.filepages * uvmexp.pagesize;
si.totalswap = (u_long)uvmexp.swpages * uvmexp.pagesize;
Index: src/sys/compat/linux32/common/linux32_sysinfo.c
diff -u src/sys/compat/linux32/common/linux32_sysinfo.c:1.9 src/sys/compat/linux32/common/linux32_sysinfo.c:1.10
--- src/sys/compat/linux32/common/linux32_sysinfo.c:1.9 Sat Dec 21 13:00:24 2019
+++ src/sys/compat/linux32/common/linux32_sysinfo.c Tue Dec 31 13:07:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_sysinfo.c,v 1.9 2019/12/21 13:00:24 ad Exp $ */
+/* $NetBSD: linux32_sysinfo.c,v 1.10 2019/12/31 13:07:13 ad Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_sysinfo.c,v 1.9 2019/12/21 13:00:24 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_sysinfo.c,v 1.10 2019/12/31 13:07:13 ad Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -77,7 +77,7 @@ linux32_sys_sysinfo(struct lwp *l, const
si.loads[1] = la->ldavg[1] * LINUX_SYSINFO_LOADS_SCALE / la->fscale;
si.loads[2] = la->ldavg[2] * LINUX_SYSINFO_LOADS_SCALE / la->fscale;
si.totalram = ctob((u_long)physmem);
- si.freeram = (u_long)uvm_free() * uvmexp.pagesize;
+ si.freeram = (u_long)uvm_availmem() * uvmexp.pagesize;
si.sharedram = 0; /* XXX */
si.bufferram = (u_long)uvmexp.filepages * uvmexp.pagesize;
si.totalswap = (u_long)uvmexp.swpages * uvmexp.pagesize;
Index: src/sys/dev/ccd.c
diff -u src/sys/dev/ccd.c:1.182 src/sys/dev/ccd.c:1.183
--- src/sys/dev/ccd.c:1.182 Sat Dec 21 13:00:24 2019
+++ src/sys/dev/ccd.c Tue Dec 31 13:07:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.182 2019/12/21 13:00:24 ad Exp $ */
+/* $NetBSD: ccd.c,v 1.183 2019/12/31 13:07:13 ad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.182 2019/12/21 13:00:24 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.183 2019/12/31 13:07:13 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -702,7 +702,7 @@ ccdbackoff(struct ccd_softc *cs)
{
/* XXX Arbitrary, should be a uvm call. */
- return uvm_free() < (uvmexp.freemin >> 1) &&
+ return uvm_availmem() < (uvmexp.freemin >> 1) &&
disk_isbusy(&cs->sc_dkdev);
}
Index: src/sys/fs/tmpfs/tmpfs_mem.c
diff -u src/sys/fs/tmpfs/tmpfs_mem.c:1.11 src/sys/fs/tmpfs/tmpfs_mem.c:1.12
--- src/sys/fs/tmpfs/tmpfs_mem.c:1.11 Sat Dec 21 13:00:24 2019
+++ src/sys/fs/tmpfs/tmpfs_mem.c Tue Dec 31 13:07:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_mem.c,v 1.11 2019/12/21 13:00:24 ad Exp $ */
+/* $NetBSD: tmpfs_mem.c,v 1.12 2019/12/31 13:07:13 ad Exp $ */
/*
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_mem.c,v 1.11 2019/12/21 13:00:24 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_mem.c,v 1.12 2019/12/31 13:07:13 ad Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -102,7 +102,7 @@ tmpfs_mem_info(bool total)
if (!total) {
size -= uvmexp.swpgonly;
}
- size += uvm_free();
+ size += uvm_availmem();
size += uvmexp.filepages;
if (size > uvmexp.wired) {
size -= uvmexp.wired;
Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.513 src/sys/kern/init_main.c:1.514
--- src/sys/kern/init_main.c:1.513 Fri Dec 27 12:51:57 2019
+++ src/sys/kern/init_main.c Tue Dec 31 13:07:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.513 2019/12/27 12:51:57 ad Exp $ */
+/* $NetBSD: init_main.c,v 1.514 2019/12/31 13:07:13 ad Exp $ */
/*-
* Copyright (c) 2008, 2009, 2019 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.513 2019/12/27 12:51:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.514 2019/12/31 13:07:13 ad Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -1178,6 +1178,6 @@ banner(void)
(*pr)("%s%s", copyright, version);
format_bytes(pbuf, MEM_PBUFSIZE, ctob((uint64_t)physmem));
(*pr)("total memory = %s\n", pbuf);
- format_bytes(pbuf, MEM_PBUFSIZE, ctob((uint64_t)uvm_free()));
+ format_bytes(pbuf, MEM_PBUFSIZE, ctob((uint64_t)uvm_availmem()));
(*pr)("avail memory = %s\n", pbuf);
}
Index: src/sys/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.142 src/sys/kern/kern_module.c:1.143
--- src/sys/kern/kern_module.c:1.142 Sat Dec 21 13:00:24 2019
+++ src/sys/kern/kern_module.c Tue Dec 31 13:07:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.142 2019/12/21 13:00:24 ad Exp $ */
+/* $NetBSD: kern_module.c,v 1.143 2019/12/31 13:07:13 ad Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.142 2019/12/21 13:00:24 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.143 2019/12/31 13:07:13 ad Exp $");
#define _MODULE_INTERNAL
@@ -1570,7 +1570,7 @@ module_thread(void *cookie)
if (!ISSET(mod->mod_flags, MODFLG_AUTO_LOADED))
continue;
- if (uvm_free() < uvmexp.freemin) {
+ if (uvm_availmem() < uvmexp.freemin) {
module_thread_ticks = hz;
} else if (module_autotime == 0 ||
mod->mod_autotime == 0) {
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.238 src/sys/kern/kern_proc.c:1.239
--- src/sys/kern/kern_proc.c:1.238 Sat Dec 21 13:00:24 2019
+++ src/sys/kern/kern_proc.c Tue Dec 31 13:07:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.238 2019/12/21 13:00:24 ad Exp $ */
+/* $NetBSD: kern_proc.c,v 1.239 2019/12/31 13:07:13 ad Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.238 2019/12/21 13:00:24 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.239 2019/12/31 13:07:13 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -487,7 +487,7 @@ proc0_init(void)
rlim[RLIMIT_NPROC].rlim_max = maxproc;
rlim[RLIMIT_NPROC].rlim_cur = maxproc < maxuprc ? maxproc : maxuprc;
- lim = MIN(VM_MAXUSER_ADDRESS, ctob((rlim_t)uvm_free()));
+ lim = MIN(VM_MAXUSER_ADDRESS, ctob((rlim_t)uvm_availmem()));
rlim[RLIMIT_RSS].rlim_max = lim;
rlim[RLIMIT_MEMLOCK].rlim_max = lim;
rlim[RLIMIT_MEMLOCK].rlim_cur = lim / 3;
Index: src/sys/kern/vfs_bio.c
diff -u src/sys/kern/vfs_bio.c:1.285 src/sys/kern/vfs_bio.c:1.286
--- src/sys/kern/vfs_bio.c:1.285 Fri Dec 27 09:41:51 2019
+++ src/sys/kern/vfs_bio.c Tue Dec 31 13:07:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_bio.c,v 1.285 2019/12/27 09:41:51 msaitoh Exp $ */
+/* $NetBSD: vfs_bio.c,v 1.286 2019/12/31 13:07:13 ad Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2019 The NetBSD Foundation, Inc.
@@ -123,7 +123,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.285 2019/12/27 09:41:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.286 2019/12/31 13:07:13 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_bufcache.h"
@@ -614,7 +614,7 @@ buf_canrelease(void)
ninvalid += bufqueues[BQ_AGE].bq_bytes;
- pagedemand = uvmexp.freetarg - uvm_free();
+ pagedemand = uvmexp.freetarg - uvm_availmem();
if (pagedemand < 0)
return ninvalid;
return MAX(ninvalid, MIN(2 * MAXBSIZE,
Index: src/sys/miscfs/procfs/procfs_linux.c
diff -u src/sys/miscfs/procfs/procfs_linux.c:1.78 src/sys/miscfs/procfs/procfs_linux.c:1.79
--- src/sys/miscfs/procfs/procfs_linux.c:1.78 Sat Dec 21 13:00:24 2019
+++ src/sys/miscfs/procfs/procfs_linux.c Tue Dec 31 13:07:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_linux.c,v 1.78 2019/12/21 13:00:24 ad Exp $ */
+/* $NetBSD: procfs_linux.c,v 1.79 2019/12/31 13:07:13 ad Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.78 2019/12/21 13:00:24 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.79 2019/12/31 13:07:13 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -142,7 +142,7 @@ procfs_domeminfo(struct lwp *curl, struc
bf = malloc(LBFSZ, M_TEMP, M_WAITOK);
cpu_count_sync_all();
- freepg = (long)uvm_free();
+ freepg = (long)uvm_availmem();
filepg = (long)cpu_count_get(CPU_COUNT_FILEPAGES);
anonpg = (long)cpu_count_get(CPU_COUNT_ANONPAGES);
execpg = (long)cpu_count_get(CPU_COUNT_EXECPAGES);
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.178 src/sys/rump/librump/rumpkern/vm.c:1.179
--- src/sys/rump/librump/rumpkern/vm.c:1.178 Tue Dec 31 12:40:27 2019
+++ src/sys/rump/librump/rumpkern/vm.c Tue Dec 31 13:07:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.178 2019/12/31 12:40:27 ad Exp $ */
+/* $NetBSD: vm.c,v 1.179 2019/12/31 13:07:13 ad Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.178 2019/12/31 12:40:27 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.179 2019/12/31 13:07:13 ad Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -410,7 +410,7 @@ uvm_pageunwire(struct vm_page *pg)
}
int
-uvm_free(void)
+uvm_availmem(void)
{
return uvmexp.free;
Index: src/sys/ufs/chfs/chfs_subr.c
diff -u src/sys/ufs/chfs/chfs_subr.c:1.10 src/sys/ufs/chfs/chfs_subr.c:1.11
--- src/sys/ufs/chfs/chfs_subr.c:1.10 Sat Dec 21 13:00:25 2019
+++ src/sys/ufs/chfs/chfs_subr.c Tue Dec 31 13:07:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_subr.c,v 1.10 2019/12/21 13:00:25 ad Exp $ */
+/* $NetBSD: chfs_subr.c,v 1.11 2019/12/31 13:07:13 ad Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -79,7 +79,7 @@ chfs_mem_info(bool total)
if (!total) {
size -= uvmexp.swpgonly;
}
- size += uvm_free();
+ size += uvm_availmem();
size += uvmexp.filepages;
if (size > uvmexp.wired) {
size -= uvmexp.wired;
Index: src/sys/ufs/lfs/lfs_bio.c
diff -u src/sys/ufs/lfs/lfs_bio.c:1.143 src/sys/ufs/lfs/lfs_bio.c:1.144
--- src/sys/ufs/lfs/lfs_bio.c:1.143 Sat Dec 21 13:00:25 2019
+++ src/sys/ufs/lfs/lfs_bio.c Tue Dec 31 13:07:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_bio.c,v 1.143 2019/12/21 13:00:25 ad Exp $ */
+/* $NetBSD: lfs_bio.c,v 1.144 2019/12/31 13:07:14 ad Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.143 2019/12/21 13:00:25 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.144 2019/12/31 13:07:14 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -767,7 +767,7 @@ lfs_wait_pages(void)
int active, inactive;
uvm_estimatepageable(&active, &inactive);
- return LFS_WAIT_RESOURCE(active + inactive + uvm_free(), 1);
+ return LFS_WAIT_RESOURCE(active + inactive + uvm_availmem(), 1);
}
int
@@ -776,5 +776,5 @@ lfs_max_pages(void)
int active, inactive;
uvm_estimatepageable(&active, &inactive);
- return LFS_MAX_RESOURCE(active + inactive + uvm_free(), 1);
+ return LFS_MAX_RESOURCE(active + inactive + uvm_availmem(), 1);
}
Index: src/sys/uvm/uvm_extern.h
diff -u src/sys/uvm/uvm_extern.h:1.216 src/sys/uvm/uvm_extern.h:1.217
--- src/sys/uvm/uvm_extern.h:1.216 Fri Dec 27 12:51:57 2019
+++ src/sys/uvm/uvm_extern.h Tue Dec 31 13:07:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_extern.h,v 1.216 2019/12/27 12:51:57 ad Exp $ */
+/* $NetBSD: uvm_extern.h,v 1.217 2019/12/31 13:07:14 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -736,7 +736,7 @@ int uvm_obj_wirepages(struct uvm_objec
void uvm_obj_unwirepages(struct uvm_object *, off_t, off_t);
/* uvm_page.c */
-int uvm_free(void);
+int uvm_availmem(void);
void uvm_page_numa_load(paddr_t, paddr_t, u_int);
struct vm_page *uvm_pagealloc_strat(struct uvm_object *,
voff_t, struct vm_anon *, int, int, int);
Index: src/sys/uvm/uvm_glue.c
diff -u src/sys/uvm/uvm_glue.c:1.173 src/sys/uvm/uvm_glue.c:1.174
--- src/sys/uvm/uvm_glue.c:1.173 Fri Dec 27 12:51:57 2019
+++ src/sys/uvm/uvm_glue.c Tue Dec 31 13:07:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_glue.c,v 1.173 2019/12/27 12:51:57 ad Exp $ */
+/* $NetBSD: uvm_glue.c,v 1.174 2019/12/31 13:07:14 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.173 2019/12/27 12:51:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.174 2019/12/31 13:07:14 ad Exp $");
#include "opt_kgdb.h"
#include "opt_kstack.h"
@@ -482,7 +482,7 @@ uvm_init_limits(struct proc *p)
p->p_rlimit[RLIMIT_AS].rlim_cur = RLIM_INFINITY;
p->p_rlimit[RLIMIT_AS].rlim_max = RLIM_INFINITY;
p->p_rlimit[RLIMIT_RSS].rlim_cur = MIN(VM_MAXUSER_ADDRESS,
- ctob((rlim_t)uvm_free()));
+ ctob((rlim_t)uvm_availmem()));
}
/*
Index: src/sys/uvm/uvm_meter.c
diff -u src/sys/uvm/uvm_meter.c:1.72 src/sys/uvm/uvm_meter.c:1.73
--- src/sys/uvm/uvm_meter.c:1.72 Sat Dec 21 14:33:18 2019
+++ src/sys/uvm/uvm_meter.c Tue Dec 31 13:07:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_meter.c,v 1.72 2019/12/21 14:33:18 ad Exp $ */
+/* $NetBSD: uvm_meter.c,v 1.73 2019/12/31 13:07:14 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.72 2019/12/21 14:33:18 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.73 2019/12/31 13:07:14 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -107,7 +107,7 @@ sysctl_vm_uvmexp2(SYSCTLFN_ARGS)
u.pagemask = uvmexp.pagemask;
u.pageshift = uvmexp.pageshift;
u.npages = uvmexp.npages;
- u.free = uvm_free();
+ u.free = uvm_availmem();
u.active = active;
u.inactive = inactive;
u.paging = uvmexp.paging;
@@ -382,7 +382,7 @@ uvm_total(struct vmtotal *totalp)
/*
* Calculate object memory usage statistics.
*/
- freepg = uvm_free();
+ freepg = uvm_availmem();
uvm_estimatepageable(&active, NULL);
totalp->t_free = freepg;
totalp->t_vm = uvmexp.npages - freepg + uvmexp.swpginuse;
@@ -449,7 +449,7 @@ uvm_update_uvmexp(void)
cpu_count_sync_all();
- uvmexp.free = (int)uvm_free();
+ uvmexp.free = (int)uvm_availmem();
uvmexp.zeropages = (int)cpu_count_get(CPU_COUNT_ZEROPAGES);
uvmexp.cpuhit = (int)cpu_count_get(CPU_COUNT_CPUHIT);
uvmexp.cpumiss = (int)cpu_count_get(CPU_COUNT_CPUMISS);
Index: src/sys/uvm/uvm_page.c
diff -u src/sys/uvm/uvm_page.c:1.218 src/sys/uvm/uvm_page.c:1.219
--- src/sys/uvm/uvm_page.c:1.218 Tue Dec 31 12:40:27 2019
+++ src/sys/uvm/uvm_page.c Tue Dec 31 13:07:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.c,v 1.218 2019/12/31 12:40:27 ad Exp $ */
+/* $NetBSD: uvm_page.c,v 1.219 2019/12/31 13:07:14 ad Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.218 2019/12/31 12:40:27 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.219 2019/12/31 13:07:14 ad Exp $");
#include "opt_ddb.h"
#include "opt_uvm.h"
@@ -993,13 +993,13 @@ uvm_cpu_attach(struct cpu_info *ci)
}
/*
- * uvm_free: fetch the total amount of free memory in pages. This can have a
- * detrimental effect on performance due to false sharing; don't call unless
- * needed.
+ * uvm_availmem: fetch the total amount of free memory in pages. this can
+ * have a detrimental effect on performance due to false sharing; don't call
+ * unless needed.
*/
int
-uvm_free(void)
+uvm_availmem(void)
{
struct pgfreelist *pgfl;
int fl, b, fpages;
Index: src/sys/uvm/uvm_pdaemon.c
diff -u src/sys/uvm/uvm_pdaemon.c:1.120 src/sys/uvm/uvm_pdaemon.c:1.121
--- src/sys/uvm/uvm_pdaemon.c:1.120 Tue Dec 31 12:40:27 2019
+++ src/sys/uvm/uvm_pdaemon.c Tue Dec 31 13:07:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pdaemon.c,v 1.120 2019/12/31 12:40:27 ad Exp $ */
+/* $NetBSD: uvm_pdaemon.c,v 1.121 2019/12/31 13:07:14 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.120 2019/12/31 12:40:27 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.121 2019/12/31 13:07:14 ad Exp $");
#include "opt_uvmhist.h"
#include "opt_readahead.h"
@@ -182,7 +182,7 @@ uvm_wait(const char *wmsg)
void
uvm_kick_pdaemon(void)
{
- int fpages = uvm_free();
+ int fpages = uvm_availmem();
if (fpages + uvmexp.paging < uvmexp.freemin ||
(fpages + uvmexp.paging < uvmexp.freetarg &&
@@ -300,7 +300,7 @@ uvm_pageout(void *arg)
* Estimate a hint. Note that bufmem are returned to
* system only when entire pool page is empty.
*/
- fpages = uvm_free();
+ fpages = uvm_availmem();
UVMHIST_LOG(pdhist," free/ftarg=%jd/%jd",
fpages, uvmexp.freetarg, 0,0);
@@ -318,7 +318,8 @@ uvm_pageout(void *arg)
* if there's any free memory to be had,
* wake up any waiters.
*/
- if (uvm_free() > uvmexp.reserve_kernel || uvmexp.paging == 0) {
+ if (uvm_availmem() > uvmexp.reserve_kernel ||
+ uvmexp.paging == 0) {
mutex_spin_enter(&uvmpd_lock);
wakeup(&uvmexp.free);
uvm_pagedaemon_waiters = 0;
@@ -379,7 +380,7 @@ uvm_pageout_done(int npages)
*/
mutex_spin_enter(&uvmpd_lock);
- if (uvm_free() <= uvmexp.reserve_kernel) {
+ if (uvm_availmem() <= uvmexp.reserve_kernel) {
wakeup(&uvm.pagedaemon);
} else if (uvm_pagedaemon_waiters != 0) {
wakeup(&uvmexp.free);
@@ -666,7 +667,7 @@ uvmpd_scan_queue(void)
* see if we've met the free target.
*/
- if (uvm_free() + uvmexp.paging
+ if (uvm_availmem() + uvmexp.paging
#if defined(VMSWAP)
+ swapcluster_nused(&swc)
#endif /* defined(VMSWAP) */
@@ -795,7 +796,7 @@ uvmpd_scan_queue(void)
* free target when all the current pageouts complete.
*/
- if (uvm_free() + uvmexp.paging > uvmexp.freetarg << 2) {
+ if (uvm_availmem() + uvmexp.paging > uvmexp.freetarg << 2) {
mutex_exit(slock);
continue;
}
@@ -904,7 +905,7 @@ uvmpd_scan(void)
*/
swap_shortage = 0;
- fpages = uvm_free();
+ fpages = uvm_availmem();
if (fpages < uvmexp.freetarg &&
uvmexp.swpginuse >= uvmexp.swpgavail &&
!uvm_swapisfull() &&
@@ -919,7 +920,7 @@ uvmpd_scan(void)
* modules.
*/
- if (uvm_free() < uvmexp.freemin) {
+ if (uvm_availmem() < uvmexp.freemin) {
module_thread_kick();
}
}
@@ -1030,7 +1031,7 @@ uvmpd_pool_drain_thread(void *arg)
/*
* kill unused metadata buffers.
*/
- bufcnt = uvmexp.freetarg - uvm_free();
+ bufcnt = uvmexp.freetarg - uvm_availmem();
if (bufcnt < 0)
bufcnt = 0;
Index: src/sys/uvm/uvm_pdpolicy_clock.c
diff -u src/sys/uvm/uvm_pdpolicy_clock.c:1.26 src/sys/uvm/uvm_pdpolicy_clock.c:1.27
--- src/sys/uvm/uvm_pdpolicy_clock.c:1.26 Tue Dec 31 12:40:27 2019
+++ src/sys/uvm/uvm_pdpolicy_clock.c Tue Dec 31 13:07:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pdpolicy_clock.c,v 1.26 2019/12/31 12:40:27 ad Exp $ */
+/* $NetBSD: uvm_pdpolicy_clock.c,v 1.27 2019/12/31 13:07:14 ad Exp $ */
/* NetBSD: uvm_pdaemon.c,v 1.72 2006/01/05 10:47:33 yamt Exp $ */
/*
@@ -69,7 +69,7 @@
#else /* defined(PDSIM) */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.26 2019/12/31 12:40:27 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.27 2019/12/31 13:07:14 ad Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -154,7 +154,7 @@ uvmpdpol_scaninit(void)
*/
cpu_count_sync_all();
- freepg = uvm_free();
+ freepg = uvm_availmem();
anonpg = cpu_count_get(CPU_COUNT_ANONPAGES);
filepg = cpu_count_get(CPU_COUNT_FILEPAGES);
execpg = cpu_count_get(CPU_COUNT_EXECPAGES);
Index: src/sys/uvm/uvm_pglist.c
diff -u src/sys/uvm/uvm_pglist.c:1.78 src/sys/uvm/uvm_pglist.c:1.79
--- src/sys/uvm/uvm_pglist.c:1.78 Fri Dec 27 12:51:57 2019
+++ src/sys/uvm/uvm_pglist.c Tue Dec 31 13:07:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pglist.c,v 1.78 2019/12/27 12:51:57 ad Exp $ */
+/* $NetBSD: uvm_pglist.c,v 1.79 2019/12/31 13:07:14 ad Exp $ */
/*-
* Copyright (c) 1997, 2019 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.78 2019/12/27 12:51:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.79 2019/12/31 13:07:14 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -309,7 +309,8 @@ uvm_pglistalloc_contig(int num, paddr_t
uvm_pgfl_lock();
/* Are there even any free pages? */
- if (uvm_free() <= (uvmexp.reserve_pagedaemon + uvmexp.reserve_kernel))
+ if (uvm_availmem() <=
+ (uvmexp.reserve_pagedaemon + uvmexp.reserve_kernel))
goto out;
for (fl = 0; fl < VM_NFREELIST; fl++) {
@@ -454,7 +455,8 @@ again:
count++;
/* Are there even any free pages? */
- if (uvm_free() <= (uvmexp.reserve_pagedaemon + uvmexp.reserve_kernel))
+ if (uvm_availmem() <=
+ (uvmexp.reserve_pagedaemon + uvmexp.reserve_kernel))
goto out;
for (fl = 0; fl < VM_NFREELIST; fl++) {
Index: src/sys/uvm/uvm_stat.c
diff -u src/sys/uvm/uvm_stat.c:1.42 src/sys/uvm/uvm_stat.c:1.43
--- src/sys/uvm/uvm_stat.c:1.42 Sat Dec 21 13:00:25 2019
+++ src/sys/uvm/uvm_stat.c Tue Dec 31 13:07:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_stat.c,v 1.42 2019/12/21 13:00:25 ad Exp $ */
+/* $NetBSD: uvm_stat.c,v 1.43 2019/12/31 13:07:14 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_stat.c,v 1.42 2019/12/21 13:00:25 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_stat.c,v 1.43 2019/12/31 13:07:14 ad Exp $");
#include "opt_readahead.h"
#include "opt_ddb.h"
@@ -67,7 +67,7 @@ uvmexp_print(void (*pr)(const char *, ..
uvmexp.pagesize, uvmexp.pagesize, uvmexp.pagemask,
uvmexp.pageshift, uvmexp.ncolors);
(*pr)(" %d VM pages: %d active, %d inactive, %d wired, %d free\n",
- uvmexp.npages, active, inactive, uvmexp.wired, uvm_free());
+ uvmexp.npages, active, inactive, uvmexp.wired, uvm_availmem());
(*pr)(" pages %" PRId64 " anon, %" PRId64 " file, %" PRId64 " exec\n",
cpu_count_get(CPU_COUNT_ANONPAGES),
cpu_count_get(CPU_COUNT_FILEPAGES),
