Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/uvm uvmexp.free -> uvm_free()



details:   https://anonhg.NetBSD.org/src/rev/634f08952fb7
branches:  trunk
changeset: 1005799:634f08952fb7
user:      ad <ad%NetBSD.org@localhost>
date:      Sat Dec 21 13:00:20 2019 +0000

description:
uvmexp.free -> uvm_free()

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/arc.c |   4 ++--
 external/cddl/osnet/sys/kern/misc.c              |   4 ++--
 sys/arch/alpha/alpha/machdep.c                   |   6 +++---
 sys/arch/atari/atari/machdep.c                   |   6 +++---
 sys/arch/cesfic/cesfic/machdep.c                 |   6 +++---
 sys/arch/emips/emips/machdep.c                   |   6 +++---
 sys/arch/evbppc/explora/machdep.c                |   6 +++---
 sys/arch/evbppc/virtex/machdep.c                 |   6 +++---
 sys/arch/evbppc/walnut/machdep.c                 |   6 +++---
 sys/arch/ews4800mips/ews4800mips/machdep.c       |   6 +++---
 sys/arch/hp300/hp300/machdep.c                   |   6 +++---
 sys/arch/hppa/hppa/machdep.c                     |   6 +++---
 sys/arch/luna68k/luna68k/machdep.c               |   6 +++---
 sys/arch/mac68k/mac68k/machdep.c                 |   6 +++---
 sys/arch/mips/mips/cpu_subr.c                    |   6 +++---
 sys/arch/mvme68k/mvme68k/machdep.c               |   6 +++---
 sys/arch/news68k/news68k/machdep.c               |   6 +++---
 sys/arch/next68k/next68k/machdep.c               |   6 +++---
 sys/arch/powerpc/booke/booke_machdep.c           |   6 +++---
 sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c         |   6 +++---
 sys/arch/powerpc/oea/oea_machdep.c               |   6 +++---
 sys/arch/riscv/riscv/riscv_machdep.c             |   4 ++--
 sys/arch/sgimips/sgimips/machdep.c               |   6 +++---
 sys/arch/sh3/sh3/sh3_machdep.c                   |   6 +++---
 sys/arch/sparc/sparc/machdep.c                   |   6 +++---
 sys/arch/sparc64/sparc64/machdep.c               |   6 +++---
 sys/arch/sun2/sun2/machdep.c                     |   6 +++---
 sys/arch/sun3/sun3/machdep.c                     |   6 +++---
 sys/arch/sun3/sun3x/machdep.c                    |   6 +++---
 sys/arch/vax/vax/machdep.c                       |   6 +++---
 sys/arch/x68k/x68k/machdep.c                     |   6 +++---
 sys/arch/x86/x86/pmap.c                          |  21 ++++++++-------------
 sys/compat/linux/common/linux_misc.c             |   6 +++---
 sys/compat/linux32/common/linux32_sysinfo.c      |   6 +++---
 sys/dev/ccd.c                                    |   6 +++---
 sys/fs/tmpfs/tmpfs_mem.c                         |   6 +++---
 sys/kern/init_main.c                             |   6 +++---
 sys/kern/kern_module.c                           |   6 +++---
 sys/kern/kern_proc.c                             |   6 +++---
 sys/kern/vfs_bio.c                               |   6 +++---
 sys/miscfs/procfs/procfs_linux.c                 |   6 +++---
 sys/ufs/chfs/chfs_subr.c                         |   4 ++--
 sys/ufs/lfs/lfs_bio.c                            |   8 ++++----
 sys/uvm/uvm_glue.c                               |   8 ++++----
 sys/uvm/uvm_meter.c                              |  16 +++++++++-------
 sys/uvm/uvm_pdpolicy_clock.c                     |   6 +++---
 sys/uvm/uvm_pglist.c                             |   8 ++++----
 sys/uvm/uvm_stat.c                               |   6 +++---
 48 files changed, 154 insertions(+), 157 deletions(-)

diffs (truncated from 1329 to 300 lines):

diff -r 11cc3ef4d4e5 -r 634f08952fb7 external/cddl/osnet/dist/uts/common/fs/zfs/arc.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c  Sat Dec 21 12:58:26 2019 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c  Sat Dec 21 13:00:20 2019 +0000
@@ -283,9 +283,9 @@
 #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)
diff -r 11cc3ef4d4e5 -r 634f08952fb7 external/cddl/osnet/sys/kern/misc.c
--- a/external/cddl/osnet/sys/kern/misc.c       Sat Dec 21 12:58:26 2019 +0000
+++ b/external/cddl/osnet/sys/kern/misc.c       Sat Dec 21 13:00:20 2019 +0000
@@ -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 @@
        int bufcnt;
        struct pool *pp;
        
-       bufcnt = uvmexp.freetarg - uvmexp.free;
+       bufcnt = uvmexp.freetarg - uvm_free();
        if (bufcnt < 0)
                bufcnt = 0;
 
diff -r 11cc3ef4d4e5 -r 634f08952fb7 sys/arch/alpha/alpha/machdep.c
--- a/sys/arch/alpha/alpha/machdep.c    Sat Dec 21 12:58:26 2019 +0000
+++ b/sys/arch/alpha/alpha/machdep.c    Sat Dec 21 13:00:20 2019 +0000
@@ -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 @@
 #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
        {
diff -r 11cc3ef4d4e5 -r 634f08952fb7 sys/arch/atari/atari/machdep.c
--- a/sys/arch/atari/atari/machdep.c    Sat Dec 21 12:58:26 2019 +0000
+++ b/sys/arch/atari/atari/machdep.c    Sat Dec 21 13:00:20 2019 +0000
@@ -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 @@
 #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);
 
        /*
diff -r 11cc3ef4d4e5 -r 634f08952fb7 sys/arch/cesfic/cesfic/machdep.c
--- a/sys/arch/cesfic/cesfic/machdep.c  Sat Dec 21 12:58:26 2019 +0000
+++ b/sys/arch/cesfic/cesfic/machdep.c  Sat Dec 21 13:00:20 2019 +0000
@@ -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 @@
 #ifdef DEBUG
        pmapdebug = opmapdebug;
 #endif
-       printf("avail mem = %ld\n", ptoa(uvmexp.free));
+       printf("avail mem = %ld\n", ptoa(uvm_free()));
 }
 
 /*
diff -r 11cc3ef4d4e5 -r 634f08952fb7 sys/arch/emips/emips/machdep.c
--- a/sys/arch/emips/emips/machdep.c    Sat Dec 21 12:58:26 2019 +0000
+++ b/sys/arch/emips/emips/machdep.c    Sat Dec 21 13:00:20 2019 +0000
@@ -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 @@
 #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);
 }
 
diff -r 11cc3ef4d4e5 -r 634f08952fb7 sys/arch/evbppc/explora/machdep.c
--- a/sys/arch/evbppc/explora/machdep.c Sat Dec 21 12:58:26 2019 +0000
+++ b/sys/arch/evbppc/explora/machdep.c Sat Dec 21 13:00:20 2019 +0000
@@ -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 @@
         * pool pages.
         */
 
-       format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
+       format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
        printf("avail memory = %s\n", pbuf);
 
        /*
diff -r 11cc3ef4d4e5 -r 634f08952fb7 sys/arch/evbppc/virtex/machdep.c
--- a/sys/arch/evbppc/virtex/machdep.c  Sat Dec 21 12:58:26 2019 +0000
+++ b/sys/arch/evbppc/virtex/machdep.c  Sat Dec 21 13:00:20 2019 +0000
@@ -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 @@
         * pool pages.
         */
 
-       format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
+       format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
        printf("avail memory = %s\n", pbuf);
 
        /*
diff -r 11cc3ef4d4e5 -r 634f08952fb7 sys/arch/evbppc/walnut/machdep.c
--- a/sys/arch/evbppc/walnut/machdep.c  Sat Dec 21 12:58:26 2019 +0000
+++ b/sys/arch/evbppc/walnut/machdep.c  Sat Dec 21 13:00:20 2019 +0000
@@ -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 @@
         * pool pages.
         */
 
-       format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
+       format_bytes(pbuf, sizeof(pbuf), ptoa(uvm_free()));
        printf("avail memory = %s\n", pbuf);
 
        /*
diff -r 11cc3ef4d4e5 -r 634f08952fb7 sys/arch/ews4800mips/ews4800mips/machdep.c
--- a/sys/arch/ews4800mips/ews4800mips/machdep.c        Sat Dec 21 12:58:26 2019 +0000
+++ b/sys/arch/ews4800mips/ews4800mips/machdep.c        Sat Dec 21 13:00:20 2019 +0000
@@ -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 @@
         * 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);
 }
 
diff -r 11cc3ef4d4e5 -r 634f08952fb7 sys/arch/hp300/hp300/machdep.c
--- a/sys/arch/hp300/hp300/machdep.c    Sat Dec 21 12:58:26 2019 +0000
+++ b/sys/arch/hp300/hp300/machdep.c    Sat Dec 21 13:00:20 2019 +0000
@@ -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 @@
 #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);
 
        /*
diff -r 11cc3ef4d4e5 -r 634f08952fb7 sys/arch/hppa/hppa/machdep.c
--- a/sys/arch/hppa/hppa/machdep.c      Sat Dec 21 12:58:26 2019 +0000
+++ b/sys/arch/hppa/hppa/machdep.c      Sat Dec 21 13:00:20 2019 +0000
@@ -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 @@
 #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()));



Home | Main Index | Thread Index | Old Index