Module Name: src
Committed By: ad
Date: Sat Dec 21 13:00:25 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: arc.c
src/external/cddl/osnet/sys/kern: misc.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/arch/x86/x86: pmap.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/ufs/chfs: chfs_subr.c
src/sys/ufs/lfs: lfs_bio.c
src/sys/uvm: uvm_glue.c uvm_meter.c uvm_pdpolicy_clock.c uvm_pglist.c
uvm_stat.c
Log Message:
uvmexp.free -> uvm_free()
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/sys/kern/misc.c
cvs rdiff -u -r1.355 -r1.356 src/sys/arch/alpha/alpha/machdep.c
cvs rdiff -u -r1.180 -r1.181 src/sys/arch/atari/atari/machdep.c
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/cesfic/cesfic/machdep.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/emips/emips/machdep.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbppc/explora/machdep.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbppc/virtex/machdep.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/evbppc/walnut/machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/ews4800mips/ews4800mips/machdep.c
cvs rdiff -u -r1.230 -r1.231 src/sys/arch/hp300/hp300/machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hppa/hppa/machdep.c
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/luna68k/luna68k/machdep.c
cvs rdiff -u -r1.355 -r1.356 src/sys/arch/mac68k/mac68k/machdep.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/mips/mips/cpu_subr.c
cvs rdiff -u -r1.155 -r1.156 src/sys/arch/mvme68k/mvme68k/machdep.c
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/news68k/news68k/machdep.c
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/next68k/next68k/machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/powerpc/booke/booke_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/powerpc/oea/oea_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/riscv/riscv/riscv_machdep.c
cvs rdiff -u -r1.147 -r1.148 src/sys/arch/sgimips/sgimips/machdep.c
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/sh3/sh3/sh3_machdep.c
cvs rdiff -u -r1.331 -r1.332 src/sys/arch/sparc/sparc/machdep.c
cvs rdiff -u -r1.295 -r1.296 src/sys/arch/sparc64/sparc64/machdep.c
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/sun2/sun2/machdep.c
cvs rdiff -u -r1.209 -r1.210 src/sys/arch/sun3/sun3/machdep.c
cvs rdiff -u -r1.136 -r1.137 src/sys/arch/sun3/sun3x/machdep.c
cvs rdiff -u -r1.193 -r1.194 src/sys/arch/vax/vax/machdep.c
cvs rdiff -u -r1.200 -r1.201 src/sys/arch/x68k/x68k/machdep.c
cvs rdiff -u -r1.346 -r1.347 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.245 -r1.246 src/sys/compat/linux/common/linux_misc.c
cvs rdiff -u -r1.8 -r1.9 src/sys/compat/linux32/common/linux32_sysinfo.c
cvs rdiff -u -r1.181 -r1.182 src/sys/dev/ccd.c
cvs rdiff -u -r1.10 -r1.11 src/sys/fs/tmpfs/tmpfs_mem.c
cvs rdiff -u -r1.510 -r1.511 src/sys/kern/init_main.c
cvs rdiff -u -r1.141 -r1.142 src/sys/kern/kern_module.c
cvs rdiff -u -r1.237 -r1.238 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.283 -r1.284 src/sys/kern/vfs_bio.c
cvs rdiff -u -r1.77 -r1.78 src/sys/miscfs/procfs/procfs_linux.c
cvs rdiff -u -r1.9 -r1.10 src/sys/ufs/chfs/chfs_subr.c
cvs rdiff -u -r1.142 -r1.143 src/sys/ufs/lfs/lfs_bio.c
cvs rdiff -u -r1.171 -r1.172 src/sys/uvm/uvm_glue.c
cvs rdiff -u -r1.70 -r1.71 src/sys/uvm/uvm_meter.c
cvs rdiff -u -r1.20 -r1.21 src/sys/uvm/uvm_pdpolicy_clock.c
cvs rdiff -u -r1.74 -r1.75 src/sys/uvm/uvm_pglist.c
cvs rdiff -u -r1.41 -r1.42 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.16 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.16 Mon Dec 9 00:15:11 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c Sat Dec 21 13:00:20 2019
@@ -283,9 +283,9 @@ int arc_procfd;
#ifndef ptob
#define ptob(x) ((x) * PAGE_SIZE)
#endif
-//#define needfree (uvmexp.free < uvmexp.freetarg ? uvmexp.freetarg : 0)
+//#define needfree (uvm_free() < uvmexp.freetarg ? uvmexp.freetarg : 0)
#define buf_init arc_buf_init
-#define freemem uvmexp.free
+#define freemem uvm_free()
#define minfree uvmexp.freemin
#define desfree uvmexp.freetarg
#define lotsfree (desfree * 2)
Index: src/external/cddl/osnet/sys/kern/misc.c
diff -u src/external/cddl/osnet/sys/kern/misc.c:1.5 src/external/cddl/osnet/sys/kern/misc.c:1.6
--- src/external/cddl/osnet/sys/kern/misc.c:1.5 Mon May 28 21:05:09 2018
+++ src/external/cddl/osnet/sys/kern/misc.c Sat Dec 21 13:00:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.5 2018/05/28 21:05:09 chs Exp $ */
+/* $NetBSD: misc.c,v 1.6 2019/12/21 13:00:20 ad Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@ kmem_reap(void)
int bufcnt;
struct pool *pp;
- bufcnt = uvmexp.freetarg - uvmexp.free;
+ bufcnt = uvmexp.freetarg - uvm_free();
if (bufcnt < 0)
bufcnt = 0;
Index: src/sys/arch/alpha/alpha/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.355 src/sys/arch/alpha/alpha/machdep.c:1.356
--- src/sys/arch/alpha/alpha/machdep.c:1.355 Sat Nov 23 19:40:34 2019
+++ src/sys/arch/alpha/alpha/machdep.c Sat Dec 21 13:00:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.355 2019/11/23 19:40:34 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.356 2019/12/21 13:00:20 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.355 2019/11/23 19:40:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.356 2019/12/21 13:00:20 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
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.180 src/sys/arch/atari/atari/machdep.c:1.181
--- src/sys/arch/atari/atari/machdep.c:1.180 Sat Jun 29 03:22:52 2019
+++ src/sys/arch/atari/atari/machdep.c Sat Dec 21 13:00:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.180 2019/06/29 03:22:52 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.181 2019/12/21 13:00:21 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.180 2019/06/29 03:22:52 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.181 2019/12/21 13:00:21 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/cesfic/cesfic/machdep.c
diff -u src/sys/arch/cesfic/cesfic/machdep.c:1.68 src/sys/arch/cesfic/cesfic/machdep.c:1.69
--- src/sys/arch/cesfic/cesfic/machdep.c:1.68 Sat Apr 6 03:06:25 2019
+++ src/sys/arch/cesfic/cesfic/machdep.c Sat Dec 21 13:00:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.68 2019/04/06 03:06:25 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.69 2019/12/21 13:00:21 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.68 2019/04/06 03:06:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.69 2019/12/21 13:00:21 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(uvmexp.free));
+ printf("avail mem = %ld\n", ptoa(uvm_free()));
}
/*
Index: src/sys/arch/emips/emips/machdep.c
diff -u src/sys/arch/emips/emips/machdep.c:1.13 src/sys/arch/emips/emips/machdep.c:1.14
--- src/sys/arch/emips/emips/machdep.c:1.13 Sun Jul 30 11:38:57 2017
+++ src/sys/arch/emips/emips/machdep.c Sat Dec 21 13:00:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.13 2017/07/30 11:38:57 he Exp $ */
+/* $NetBSD: machdep.c,v 1.14 2019/12/21 13:00:21 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13 2017/07/30 11:38:57 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2019/12/21 13:00:21 ad Exp $");
#include "opt_ddb.h"
@@ -458,7 +458,7 @@ cpu_startup(void)
#ifdef DEBUG
pmapdebug = opmapdebug;
#endif
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/evbppc/explora/machdep.c
diff -u src/sys/arch/evbppc/explora/machdep.c:1.37 src/sys/arch/evbppc/explora/machdep.c:1.38
--- src/sys/arch/evbppc/explora/machdep.c:1.37 Fri Jul 27 22:13:58 2012
+++ src/sys/arch/evbppc/explora/machdep.c Sat Dec 21 13:00:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.37 2012/07/27 22:13:58 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.38 2019/12/21 13:00:21 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.37 2012/07/27 22:13:58 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38 2019/12/21 13:00:21 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/evbppc/virtex/machdep.c
diff -u src/sys/arch/evbppc/virtex/machdep.c:1.22 src/sys/arch/evbppc/virtex/machdep.c:1.23
--- src/sys/arch/evbppc/virtex/machdep.c:1.22 Sun Jul 15 05:16:42 2018
+++ src/sys/arch/evbppc/virtex/machdep.c Sat Dec 21 13:00:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.22 2018/07/15 05:16:42 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.23 2019/12/21 13:00:21 ad Exp $ */
/*
* Copyright (c) 2006 Jachym Holecek
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.22 2018/07/15 05:16:42 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.23 2019/12/21 13:00:21 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/evbppc/walnut/machdep.c
diff -u src/sys/arch/evbppc/walnut/machdep.c:1.56 src/sys/arch/evbppc/walnut/machdep.c:1.57
--- src/sys/arch/evbppc/walnut/machdep.c:1.56 Sun Jul 15 05:16:43 2018
+++ src/sys/arch/evbppc/walnut/machdep.c Sat Dec 21 13:00:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.56 2018/07/15 05:16:43 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.57 2019/12/21 13:00:21 ad Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.56 2018/07/15 05:16:43 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.57 2019/12/21 13:00:21 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/ews4800mips/ews4800mips/machdep.c
diff -u src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.28 src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.29
--- src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.28 Mon Nov 6 03:47:46 2017
+++ src/sys/arch/ews4800mips/ews4800mips/machdep.c Sat Dec 21 13:00:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.28 2017/11/06 03:47:46 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.29 2019/12/21 13:00:21 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.28 2017/11/06 03:47:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 2019/12/21 13:00:21 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/hp300/hp300/machdep.c
diff -u src/sys/arch/hp300/hp300/machdep.c:1.230 src/sys/arch/hp300/hp300/machdep.c:1.231
--- src/sys/arch/hp300/hp300/machdep.c:1.230 Thu Mar 14 16:59:09 2019
+++ src/sys/arch/hp300/hp300/machdep.c Sat Dec 21 13:00:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.230 2019/03/14 16:59:09 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.231 2019/12/21 13:00:21 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.230 2019/03/14 16:59:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.231 2019/12/21 13:00:21 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/hppa/hppa/machdep.c
diff -u src/sys/arch/hppa/hppa/machdep.c:1.10 src/sys/arch/hppa/hppa/machdep.c:1.11
--- src/sys/arch/hppa/hppa/machdep.c:1.10 Sat Apr 6 03:06:25 2019
+++ src/sys/arch/hppa/hppa/machdep.c Sat Dec 21 13:00:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.10 2019/04/06 03:06:25 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.11 2019/12/21 13:00:21 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.10 2019/04/06 03:06:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.11 2019/12/21 13:00:21 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(uvmexp.free));
+ format_bytes(pbuf[0], sizeof(pbuf[0]), ptoa(uvm_free()));
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.103 src/sys/arch/luna68k/luna68k/machdep.c:1.104
--- src/sys/arch/luna68k/luna68k/machdep.c:1.103 Sun Jun 30 05:04:49 2019
+++ src/sys/arch/luna68k/luna68k/machdep.c Sat Dec 21 13:00:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.103 2019/06/30 05:04:49 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.104 2019/12/21 13:00:22 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.103 2019/06/30 05:04:49 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.104 2019/12/21 13:00:22 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/mac68k/mac68k/machdep.c
diff -u src/sys/arch/mac68k/mac68k/machdep.c:1.355 src/sys/arch/mac68k/mac68k/machdep.c:1.356
--- src/sys/arch/mac68k/mac68k/machdep.c:1.355 Sun Aug 18 07:05:16 2019
+++ src/sys/arch/mac68k/mac68k/machdep.c Sat Dec 21 13:00:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.355 2019/08/18 07:05:16 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.356 2019/12/21 13:00:22 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.355 2019/08/18 07:05:16 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.356 2019/12/21 13:00:22 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
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.41 src/sys/arch/mips/mips/cpu_subr.c:1.42
--- src/sys/arch/mips/mips/cpu_subr.c:1.41 Fri Dec 20 21:05:33 2019
+++ src/sys/arch/mips/mips/cpu_subr.c Sat Dec 21 13:00:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_subr.c,v 1.41 2019/12/20 21:05:33 ad Exp $ */
+/* $NetBSD: cpu_subr.c,v 1.42 2019/12/21 13:00:22 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.41 2019/12/20 21:05:33 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.42 2019/12/21 13:00:22 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
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.155 src/sys/arch/mvme68k/mvme68k/machdep.c:1.156
--- src/sys/arch/mvme68k/mvme68k/machdep.c:1.155 Thu Mar 14 16:59:10 2019
+++ src/sys/arch/mvme68k/mvme68k/machdep.c Sat Dec 21 13:00:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.155 2019/03/14 16:59:10 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.156 2019/12/21 13:00:22 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.155 2019/03/14 16:59:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.156 2019/12/21 13:00:22 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/news68k/news68k/machdep.c
diff -u src/sys/arch/news68k/news68k/machdep.c:1.104 src/sys/arch/news68k/news68k/machdep.c:1.105
--- src/sys/arch/news68k/news68k/machdep.c:1.104 Thu Mar 14 16:59:10 2019
+++ src/sys/arch/news68k/news68k/machdep.c Sat Dec 21 13:00:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.104 2019/03/14 16:59:10 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.105 2019/12/21 13:00:22 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.104 2019/03/14 16:59:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.105 2019/12/21 13:00:22 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/next68k/next68k/machdep.c
diff -u src/sys/arch/next68k/next68k/machdep.c:1.112 src/sys/arch/next68k/next68k/machdep.c:1.113
--- src/sys/arch/next68k/next68k/machdep.c:1.112 Thu Mar 14 16:59:10 2019
+++ src/sys/arch/next68k/next68k/machdep.c Sat Dec 21 13:00:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.112 2019/03/14 16:59:10 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.113 2019/12/21 13:00:22 ad Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.112 2019/03/14 16:59:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.113 2019/12/21 13:00:22 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
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.26 src/sys/arch/powerpc/booke/booke_machdep.c:1.27
--- src/sys/arch/powerpc/booke/booke_machdep.c:1.26 Sun Apr 7 05:25:55 2019
+++ src/sys/arch/powerpc/booke/booke_machdep.c Sat Dec 21 13:00:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: booke_machdep.c,v 1.26 2019/04/07 05:25:55 thorpej Exp $ */
+/* $NetBSD: booke_machdep.c,v 1.27 2019/12/21 13:00:22 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.26 2019/04/07 05:25:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_machdep.c,v 1.27 2019/12/21 13:00:22 ad Exp $");
#include "opt_modular.h"
@@ -191,7 +191,7 @@ booke_cpu_startup(const char *model)
* pool pages.
*/
- format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
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.26 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.27
--- src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.26 Sun Jul 15 05:16:43 2018
+++ src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c Sat Dec 21 13:00:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ibm4xx_machdep.c,v 1.26 2018/07/15 05:16:43 maxv Exp $ */
+/* $NetBSD: ibm4xx_machdep.c,v 1.27 2019/12/21 13:00:22 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.26 2018/07/15 05:16:43 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.27 2019/12/21 13:00:22 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
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.76 src/sys/arch/powerpc/oea/oea_machdep.c:1.77
--- src/sys/arch/powerpc/oea/oea_machdep.c:1.76 Wed Feb 6 07:32:50 2019
+++ src/sys/arch/powerpc/oea/oea_machdep.c Sat Dec 21 13:00:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: oea_machdep.c,v 1.76 2019/02/06 07:32:50 mrg Exp $ */
+/* $NetBSD: oea_machdep.c,v 1.77 2019/12/21 13:00:22 ad Exp $ */
/*
* Copyright (C) 2002 Matt Thomas
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.76 2019/02/06 07:32:50 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.77 2019/12/21 13:00:22 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
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.6 src/sys/arch/riscv/riscv/riscv_machdep.c:1.7
--- src/sys/arch/riscv/riscv/riscv_machdep.c:1.6 Sat Nov 23 19:40:36 2019
+++ src/sys/arch/riscv/riscv/riscv_machdep.c Sat Dec 21 13:00:23 2019
@@ -31,7 +31,7 @@
#include "opt_modular.h"
-__RCSID("$NetBSD: riscv_machdep.c,v 1.6 2019/11/23 19:40:36 ad Exp $");
+__RCSID("$NetBSD: riscv_machdep.c,v 1.7 2019/12/21 13:00:23 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/sgimips/sgimips/machdep.c
diff -u src/sys/arch/sgimips/sgimips/machdep.c:1.147 src/sys/arch/sgimips/sgimips/machdep.c:1.148
--- src/sys/arch/sgimips/sgimips/machdep.c:1.147 Sat Sep 8 02:33:33 2018
+++ src/sys/arch/sgimips/sgimips/machdep.c Sat Dec 21 13:00:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.147 2018/09/08 02:33:33 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.148 2019/12/21 13:00:23 ad Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.147 2018/09/08 02:33:33 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.148 2019/12/21 13:00:23 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
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.107 src/sys/arch/sh3/sh3/sh3_machdep.c:1.108
--- src/sys/arch/sh3/sh3/sh3_machdep.c:1.107 Sat Apr 6 03:06:27 2019
+++ src/sys/arch/sh3/sh3/sh3_machdep.c Sat Dec 21 13:00:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sh3_machdep.c,v 1.107 2019/04/06 03:06:27 thorpej Exp $ */
+/* $NetBSD: sh3_machdep.c,v 1.108 2019/12/21 13:00:23 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.107 2019/04/06 03:06:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.108 2019/12/21 13:00:23 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
printf("avail memory = %s\n", pbuf);
}
Index: src/sys/arch/sparc/sparc/machdep.c
diff -u src/sys/arch/sparc/sparc/machdep.c:1.331 src/sys/arch/sparc/sparc/machdep.c:1.332
--- src/sys/arch/sparc/sparc/machdep.c:1.331 Sun Nov 10 21:16:33 2019
+++ src/sys/arch/sparc/sparc/machdep.c Sat Dec 21 13:00:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.331 2019/11/10 21:16:33 chs Exp $ */
+/* $NetBSD: machdep.c,v 1.332 2019/12/21 13:00:23 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.331 2019/11/10 21:16:33 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.332 2019/12/21 13:00:23 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
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.295 src/sys/arch/sparc64/sparc64/machdep.c:1.296
--- src/sys/arch/sparc64/sparc64/machdep.c:1.295 Tue Dec 3 15:20:59 2019
+++ src/sys/arch/sparc64/sparc64/machdep.c Sat Dec 21 13:00:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.295 2019/12/03 15:20:59 riastradh Exp $ */
+/* $NetBSD: machdep.c,v 1.296 2019/12/21 13:00:23 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.295 2019/12/03 15:20:59 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.296 2019/12/21 13:00:23 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
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.78 src/sys/arch/sun2/sun2/machdep.c:1.79
--- src/sys/arch/sun2/sun2/machdep.c:1.78 Mon Jun 3 05:59:02 2019
+++ src/sys/arch/sun2/sun2/machdep.c Sat Dec 21 13:00:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.78 2019/06/03 05:59:02 msaitoh Exp $ */
+/* $NetBSD: machdep.c,v 1.79 2019/12/21 13:00:23 ad Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -149,7 +149,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.78 2019/06/03 05:59:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.79 2019/12/21 13:00:23 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/sun3/sun3/machdep.c
diff -u src/sys/arch/sun3/sun3/machdep.c:1.209 src/sys/arch/sun3/sun3/machdep.c:1.210
--- src/sys/arch/sun3/sun3/machdep.c:1.209 Mon Jun 3 05:59:02 2019
+++ src/sys/arch/sun3/sun3/machdep.c Sat Dec 21 13:00:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.209 2019/06/03 05:59:02 msaitoh Exp $ */
+/* $NetBSD: machdep.c,v 1.210 2019/12/21 13:00:23 ad Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.209 2019/06/03 05:59:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.210 2019/12/21 13:00:23 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/sun3/sun3x/machdep.c
diff -u src/sys/arch/sun3/sun3x/machdep.c:1.136 src/sys/arch/sun3/sun3x/machdep.c:1.137
--- src/sys/arch/sun3/sun3x/machdep.c:1.136 Mon Jun 3 05:59:02 2019
+++ src/sys/arch/sun3/sun3x/machdep.c Sat Dec 21 13:00:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.136 2019/06/03 05:59:02 msaitoh Exp $ */
+/* $NetBSD: machdep.c,v 1.137 2019/12/21 13:00:23 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.136 2019/06/03 05:59:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.137 2019/12/21 13:00:23 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/vax/vax/machdep.c
diff -u src/sys/arch/vax/vax/machdep.c:1.193 src/sys/arch/vax/vax/machdep.c:1.194
--- src/sys/arch/vax/vax/machdep.c:1.193 Sat Dec 29 11:30:12 2018
+++ src/sys/arch/vax/vax/machdep.c Sat Dec 21 13:00:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.193 2018/12/29 11:30:12 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.194 2019/12/21 13:00:24 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.193 2018/12/29 11:30:12 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.194 2019/12/21 13:00:24 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
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.200 src/sys/arch/x68k/x68k/machdep.c:1.201
--- src/sys/arch/x68k/x68k/machdep.c:1.200 Thu Apr 4 04:31:01 2019
+++ src/sys/arch/x68k/x68k/machdep.c Sat Dec 21 13:00:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.200 2019/04/04 04:31:01 isaki Exp $ */
+/* $NetBSD: machdep.c,v 1.201 2019/12/21 13:00:24 ad Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.200 2019/04/04 04:31:01 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.201 2019/12/21 13:00:24 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(uvmexp.free));
+ format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
printf("avail memory = %s\n", pbuf);
/*
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.346 src/sys/arch/x86/x86/pmap.c:1.347
--- src/sys/arch/x86/x86/pmap.c:1.346 Mon Dec 16 19:20:45 2019
+++ src/sys/arch/x86/x86/pmap.c Sat Dec 21 13:00:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.346 2019/12/16 19:20:45 ad Exp $ */
+/* $NetBSD: pmap.c,v 1.347 2019/12/21 13:00:24 ad Exp $ */
/*
* Copyright (c) 2008, 2010, 2016, 2017, 2019 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.346 2019/12/16 19:20:45 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.347 2019/12/21 13:00:24 ad Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -2513,21 +2513,16 @@ pmap_destroy(struct pmap *pmap)
/*
* If we have torn down this pmap, process deferred frees and
- * invalidations. Free now if the system is low on memory.
- * Otherwise, free when the pmap is destroyed thus avoiding a
- * TLB shootdown.
+ * invalidations. Free when the pmap is destroyed thus avoiding
+ * TLB shootdowns.
*/
l = curlwp;
if (__predict_false(l->l_md.md_gc_pmap == pmap)) {
pmap_check_ptps(pmap);
- if (uvmexp.free < uvmexp.freetarg) {
- pmap_update(pmap);
- } else {
- KASSERT(pmap->pm_gc_ptp == NULL);
- pmap->pm_gc_ptp = l->l_md.md_gc_ptp;
- l->l_md.md_gc_ptp = NULL;
- l->l_md.md_gc_pmap = NULL;
- }
+ KASSERT(pmap->pm_gc_ptp == NULL);
+ pmap->pm_gc_ptp = l->l_md.md_gc_ptp;
+ l->l_md.md_gc_ptp = NULL;
+ l->l_md.md_gc_pmap = NULL;
}
/*
Index: src/sys/compat/linux/common/linux_misc.c
diff -u src/sys/compat/linux/common/linux_misc.c:1.245 src/sys/compat/linux/common/linux_misc.c:1.246
--- src/sys/compat/linux/common/linux_misc.c:1.245 Fri Sep 20 15:25:19 2019
+++ src/sys/compat/linux/common/linux_misc.c Sat Dec 21 13:00:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.c,v 1.245 2019/09/20 15:25:19 kamil Exp $ */
+/* $NetBSD: linux_misc.c,v 1.246 2019/12/21 13:00:24 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.245 2019/09/20 15:25:19 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.246 2019/12/21 13:00:24 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)uvmexp.free * uvmexp.pagesize;
+ si.freeram = (u_long)uvm_free() * 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.8 src/sys/compat/linux32/common/linux32_sysinfo.c:1.9
--- src/sys/compat/linux32/common/linux32_sysinfo.c:1.8 Fri Aug 23 08:01:43 2019
+++ src/sys/compat/linux32/common/linux32_sysinfo.c Sat Dec 21 13:00:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_sysinfo.c,v 1.8 2019/08/23 08:01:43 maxv Exp $ */
+/* $NetBSD: linux32_sysinfo.c,v 1.9 2019/12/21 13:00:24 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.8 2019/08/23 08:01:43 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_sysinfo.c,v 1.9 2019/12/21 13:00:24 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)uvmexp.free * uvmexp.pagesize;
+ si.freeram = (u_long)uvm_free() * 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.181 src/sys/dev/ccd.c:1.182
--- src/sys/dev/ccd.c:1.181 Sun Dec 8 12:14:40 2019
+++ src/sys/dev/ccd.c Sat Dec 21 13:00:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.181 2019/12/08 12:14:40 mlelstv Exp $ */
+/* $NetBSD: ccd.c,v 1.182 2019/12/21 13:00:24 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.181 2019/12/08 12:14:40 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.182 2019/12/21 13:00:24 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 uvmexp.free < (uvmexp.freemin >> 1) &&
+ return uvm_free() < (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.10 src/sys/fs/tmpfs/tmpfs_mem.c:1.11
--- src/sys/fs/tmpfs/tmpfs_mem.c:1.10 Sat Jul 13 14:24:37 2019
+++ src/sys/fs/tmpfs/tmpfs_mem.c Sat Dec 21 13:00:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_mem.c,v 1.10 2019/07/13 14:24:37 maxv Exp $ */
+/* $NetBSD: tmpfs_mem.c,v 1.11 2019/12/21 13:00:24 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.10 2019/07/13 14:24:37 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_mem.c,v 1.11 2019/12/21 13:00:24 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 += uvmexp.free;
+ size += uvm_free();
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.510 src/sys/kern/init_main.c:1.511
--- src/sys/kern/init_main.c:1.510 Sat Dec 14 15:30:37 2019
+++ src/sys/kern/init_main.c Sat Dec 21 13:00:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.510 2019/12/14 15:30:37 ad Exp $ */
+/* $NetBSD: init_main.c,v 1.511 2019/12/21 13:00:24 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.510 2019/12/14 15:30:37 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.511 2019/12/21 13:00:24 ad Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -1174,6 +1174,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)uvmexp.free));
+ format_bytes(pbuf, MEM_PBUFSIZE, ctob(uvm_free()));
(*pr)("avail memory = %s\n", pbuf);
}
Index: src/sys/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.141 src/sys/kern/kern_module.c:1.142
--- src/sys/kern/kern_module.c:1.141 Thu Dec 12 22:55:20 2019
+++ src/sys/kern/kern_module.c Sat Dec 21 13:00:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.141 2019/12/12 22:55:20 pgoyette Exp $ */
+/* $NetBSD: kern_module.c,v 1.142 2019/12/21 13:00:24 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.141 2019/12/12 22:55:20 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.142 2019/12/21 13:00:24 ad Exp $");
#define _MODULE_INTERNAL
@@ -1570,7 +1570,7 @@ module_thread(void *cookie)
if (!ISSET(mod->mod_flags, MODFLG_AUTO_LOADED))
continue;
- if (uvmexp.free < uvmexp.freemin) {
+ if (uvm_free() < 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.237 src/sys/kern/kern_proc.c:1.238
--- src/sys/kern/kern_proc.c:1.237 Fri Dec 6 17:41:43 2019
+++ src/sys/kern/kern_proc.c Sat Dec 21 13:00:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.237 2019/12/06 17:41:43 kamil Exp $ */
+/* $NetBSD: kern_proc.c,v 1.238 2019/12/21 13:00:24 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.237 2019/12/06 17:41:43 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.238 2019/12/21 13:00:24 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)uvmexp.free));
+ lim = MIN(VM_MAXUSER_ADDRESS, ctob((rlim_t)uvm_free()));
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.283 src/sys/kern/vfs_bio.c:1.284
--- src/sys/kern/vfs_bio.c:1.283 Wed Dec 11 20:50:32 2019
+++ src/sys/kern/vfs_bio.c Sat Dec 21 13:00:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_bio.c,v 1.283 2019/12/11 20:50:32 ad Exp $ */
+/* $NetBSD: vfs_bio.c,v 1.284 2019/12/21 13:00:24 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.283 2019/12/11 20:50:32 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.284 2019/12/21 13:00:24 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 - uvmexp.free;
+ pagedemand = uvmexp.freetarg - uvm_free();
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.77 src/sys/miscfs/procfs/procfs_linux.c:1.78
--- src/sys/miscfs/procfs/procfs_linux.c:1.77 Mon Dec 16 22:47:55 2019
+++ src/sys/miscfs/procfs/procfs_linux.c Sat Dec 21 13:00:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_linux.c,v 1.77 2019/12/16 22:47:55 ad Exp $ */
+/* $NetBSD: procfs_linux.c,v 1.78 2019/12/21 13:00:24 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.77 2019/12/16 22:47:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.78 2019/12/21 13:00:24 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 = uvmexp.free;
+ freepg = (long)uvm_free();
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/ufs/chfs/chfs_subr.c
diff -u src/sys/ufs/chfs/chfs_subr.c:1.9 src/sys/ufs/chfs/chfs_subr.c:1.10
--- src/sys/ufs/chfs/chfs_subr.c:1.9 Sun Oct 20 17:18:38 2013
+++ src/sys/ufs/chfs/chfs_subr.c Sat Dec 21 13:00:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_subr.c,v 1.9 2013/10/20 17:18:38 christos Exp $ */
+/* $NetBSD: chfs_subr.c,v 1.10 2019/12/21 13:00:25 ad Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -79,7 +79,7 @@ chfs_mem_info(bool total)
if (!total) {
size -= uvmexp.swpgonly;
}
- size += uvmexp.free;
+ size += uvm_free();
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.142 src/sys/ufs/lfs/lfs_bio.c:1.143
--- src/sys/ufs/lfs/lfs_bio.c:1.142 Sat Jun 9 18:48:31 2018
+++ src/sys/ufs/lfs/lfs_bio.c Sat Dec 21 13:00:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_bio.c,v 1.142 2018/06/09 18:48:31 zafer Exp $ */
+/* $NetBSD: lfs_bio.c,v 1.143 2019/12/21 13:00:25 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.142 2018/06/09 18:48:31 zafer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.143 2019/12/21 13:00:25 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 + uvmexp.free, 1);
+ return LFS_WAIT_RESOURCE(active + inactive + uvm_free(), 1);
}
int
@@ -776,5 +776,5 @@ lfs_max_pages(void)
int active, inactive;
uvm_estimatepageable(&active, &inactive);
- return LFS_MAX_RESOURCE(active + inactive + uvmexp.free, 1);
+ return LFS_MAX_RESOURCE(active + inactive + uvm_free(), 1);
}
Index: src/sys/uvm/uvm_glue.c
diff -u src/sys/uvm/uvm_glue.c:1.171 src/sys/uvm/uvm_glue.c:1.172
--- src/sys/uvm/uvm_glue.c:1.171 Mon Dec 16 22:47:55 2019
+++ src/sys/uvm/uvm_glue.c Sat Dec 21 13:00:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_glue.c,v 1.171 2019/12/16 22:47:55 ad Exp $ */
+/* $NetBSD: uvm_glue.c,v 1.172 2019/12/21 13:00:25 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.171 2019/12/16 22:47:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.172 2019/12/21 13:00:25 ad Exp $");
#include "opt_kgdb.h"
#include "opt_kstack.h"
@@ -480,8 +480,8 @@ uvm_init_limits(struct proc *p)
p->p_rlimit[RLIMIT_DATA].rlim_max = maxdmap;
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)uvmexp.free));
+ p->p_rlimit[RLIMIT_RSS].rlim_cur = MIN(VM_MAXUSER_ADDRESS,
+ ctob((rlim_t)uvm_free()));
}
/*
Index: src/sys/uvm/uvm_meter.c
diff -u src/sys/uvm/uvm_meter.c:1.70 src/sys/uvm/uvm_meter.c:1.71
--- src/sys/uvm/uvm_meter.c:1.70 Mon Dec 16 22:47:55 2019
+++ src/sys/uvm/uvm_meter.c Sat Dec 21 13:00:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_meter.c,v 1.70 2019/12/16 22:47:55 ad Exp $ */
+/* $NetBSD: uvm_meter.c,v 1.71 2019/12/21 13:00:25 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.70 2019/12/16 22:47:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.71 2019/12/21 13:00:25 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 = uvmexp.free;
+ u.free = uvm_free();
u.active = active;
u.inactive = inactive;
u.paging = uvmexp.paging;
@@ -320,6 +320,7 @@ uvm_total(struct vmtotal *totalp)
struct vm_map *map;
int paging;
#endif
+ int freepg;
int active;
memset(totalp, 0, sizeof *totalp);
@@ -381,11 +382,12 @@ uvm_total(struct vmtotal *totalp)
/*
* Calculate object memory usage statistics.
*/
+ freepg = uvm_free();
uvm_estimatepageable(&active, NULL);
- totalp->t_free = uvmexp.free;
- totalp->t_vm = uvmexp.npages - uvmexp.free + uvmexp.swpginuse;
+ totalp->t_free = freepg;
+ totalp->t_vm = uvmexp.npages - freepg + uvmexp.swpginuse;
totalp->t_avm = active + uvmexp.swpginuse; /* XXX */
- totalp->t_rm = uvmexp.npages - uvmexp.free;
+ totalp->t_rm = uvmexp.npages - freepg;
totalp->t_arm = active;
totalp->t_vmshr = 0; /* XXX */
totalp->t_avmshr = 0; /* XXX */
@@ -447,7 +449,7 @@ uvm_update_uvmexp(void)
cpu_count_sync_all();
- /* uvmexp.free = (int)cpu_count_get(CPU_COUNT_FREE); */
+ uvmexp.free = (int)uvm_free();
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_pdpolicy_clock.c
diff -u src/sys/uvm/uvm_pdpolicy_clock.c:1.20 src/sys/uvm/uvm_pdpolicy_clock.c:1.21
--- src/sys/uvm/uvm_pdpolicy_clock.c:1.20 Mon Dec 16 22:47:55 2019
+++ src/sys/uvm/uvm_pdpolicy_clock.c Sat Dec 21 13:00:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pdpolicy_clock.c,v 1.20 2019/12/16 22:47:55 ad Exp $ */
+/* $NetBSD: uvm_pdpolicy_clock.c,v 1.21 2019/12/21 13:00:25 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.20 2019/12/16 22:47:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.21 2019/12/21 13:00:25 ad Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -155,7 +155,7 @@ uvmpdpol_scaninit(void)
*/
cpu_count_sync_all();
- freepg = uvmexp.free;
+ freepg = uvm_free();
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.74 src/sys/uvm/uvm_pglist.c:1.75
--- src/sys/uvm/uvm_pglist.c:1.74 Mon Dec 16 22:47:55 2019
+++ src/sys/uvm/uvm_pglist.c Sat Dec 21 13:00:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pglist.c,v 1.74 2019/12/16 22:47:55 ad Exp $ */
+/* $NetBSD: uvm_pglist.c,v 1.75 2019/12/21 13:00:25 ad Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.74 2019/12/16 22:47:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.75 2019/12/21 13:00:25 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -319,7 +319,7 @@ uvm_pglistalloc_contig(int num, paddr_t
mutex_spin_enter(&uvm_fpageqlock);
/* Are there even any free pages? */
- if (uvmexp.free <= (uvmexp.reserve_pagedaemon + uvmexp.reserve_kernel))
+ if (uvm_free() <= (uvmexp.reserve_pagedaemon + uvmexp.reserve_kernel))
goto out;
for (fl = 0; fl < VM_NFREELIST; fl++) {
@@ -465,7 +465,7 @@ again:
count++;
/* Are there even any free pages? */
- if (uvmexp.free <= (uvmexp.reserve_pagedaemon + uvmexp.reserve_kernel))
+ if (uvm_free() <= (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.41 src/sys/uvm/uvm_stat.c:1.42
--- src/sys/uvm/uvm_stat.c:1.41 Mon Dec 16 22:47:55 2019
+++ src/sys/uvm/uvm_stat.c Sat Dec 21 13:00:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_stat.c,v 1.41 2019/12/16 22:47:55 ad Exp $ */
+/* $NetBSD: uvm_stat.c,v 1.42 2019/12/21 13:00:25 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.41 2019/12/16 22:47:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_stat.c,v 1.42 2019/12/21 13:00:25 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, uvmexp.free);
+ uvmexp.npages, active, inactive, uvmexp.wired, uvm_free());
(*pr)(" pages %" PRId64 " anon, %" PRId64 " file, %" PRId64 " exec\n",
cpu_count_get(CPU_COUNT_ANONPAGES),
cpu_count_get(CPU_COUNT_FILEPAGES),
