Module Name: src
Committed By: cherry
Date: Thu Dec 22 14:48:00 UTC 2016
Modified Files:
src/sys/arch/acorn26/acorn26: start.c
src/sys/arch/acorn32/acorn32: rpc_machdep.c
src/sys/arch/acorn32/eb7500atx: eb7500atx_machdep.c
src/sys/arch/algor/algor: machdep.c
src/sys/arch/alpha/alpha: machdep.c
src/sys/arch/amd64/amd64: machdep.c
src/sys/arch/amiga/amiga: pmap_bootstrap.c
src/sys/arch/amigappc/amigappc: machdep.c
src/sys/arch/arc/arc: machdep.c
src/sys/arch/arm/arm32: arm32_boot.c
src/sys/arch/arm/at91: at91bus.c
src/sys/arch/atari/atari: pmap_bootstrap.c
src/sys/arch/cobalt/cobalt: machdep.c
src/sys/arch/emips/emips: machdep.c
src/sys/arch/epoc32/epoc32: machdep.c
src/sys/arch/evbarm/adi_brh: brh_machdep.c
src/sys/arch/evbarm/armadillo: armadillo9_machdep.c
src/sys/arch/evbarm/g42xxeb: g42xxeb_machdep.c
src/sys/arch/evbarm/gemini: gemini_machdep.c
src/sys/arch/evbarm/hdl_g: hdlg_machdep.c
src/sys/arch/evbarm/imx31: imx31lk_machdep.c
src/sys/arch/evbarm/iq80310: iq80310_machdep.c
src/sys/arch/evbarm/iq80321: iq80321_machdep.c
src/sys/arch/evbarm/ixdp425: ixdp425_machdep.c
src/sys/arch/evbarm/ixm1200: ixm1200_machdep.c
src/sys/arch/evbarm/lubbock: lubbock_machdep.c
src/sys/arch/evbarm/mini2440: mini2440_machdep.c
src/sys/arch/evbarm/npwr_fc: npwr_fc_machdep.c
src/sys/arch/evbarm/nslu2: nslu2_machdep.c
src/sys/arch/evbarm/osk5912: osk5912_machdep.c
src/sys/arch/evbarm/smdk2xx0: smdk2410_machdep.c smdk2800_machdep.c
src/sys/arch/evbarm/tisdp24xx: sdp24xx_machdep.c
src/sys/arch/evbarm/tsarm: tsarm_machdep.c
src/sys/arch/evbarm/viper: viper_machdep.c
src/sys/arch/evbmips/adm5120: machdep.c
src/sys/arch/evbmips/alchemy: machdep.c
src/sys/arch/evbmips/atheros: machdep.c
src/sys/arch/evbmips/cavium: machdep.c
src/sys/arch/evbmips/gdium: machdep.c
src/sys/arch/evbmips/ingenic: machdep.c
src/sys/arch/evbmips/loongson: machdep.c
src/sys/arch/evbmips/malta: machdep.c
src/sys/arch/evbmips/rasoc: machdep.c
src/sys/arch/evbmips/rmixl: machdep.c
src/sys/arch/evbppc/ev64260: machdep.c
src/sys/arch/evbppc/mpc85xx: machdep.c
src/sys/arch/evbppc/pmppc: machdep.c
src/sys/arch/ews4800mips/ews4800mips: machdep.c
src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c sa11x0_hpc_machdep.c
src/sys/arch/hpcmips/hpcmips: machdep.c
src/sys/arch/hppa/hppa: pmap.c
src/sys/arch/i386/i386: machdep.c
src/sys/arch/ia64/ia64: machdep.c
src/sys/arch/iyonix/iyonix: iyonix_machdep.c
src/sys/arch/m68k/m68k: pmap_motorola.c
src/sys/arch/mipsco/mipsco: machdep.c
src/sys/arch/netwinder/netwinder: netwinder_machdep.c
src/sys/arch/newsmips/newsmips: machdep.c
src/sys/arch/playstation2/playstation2: machdep.c
src/sys/arch/pmax/pmax: machdep.c
src/sys/arch/powerpc/ibm4xx: ibm4xx_machdep.c pmap.c
src/sys/arch/powerpc/oea: ofwoea_machdep.c prep_machdep.c
src/sys/arch/rs6000/rs6000: machdep.c
src/sys/arch/sandpoint/sandpoint: machdep.c
src/sys/arch/sbmips/sbmips: machdep.c
src/sys/arch/sgimips/sgimips: machdep.c
src/sys/arch/sh3/sh3: sh3_machdep.c
src/sys/arch/shark/ofw: ofw.c
src/sys/arch/sparc/sparc: pmap.c
src/sys/arch/sparc64/sparc64: pmap.c
src/sys/arch/sun2/sun2: pmap.c
src/sys/arch/sun3/sun3: pmap.c
src/sys/arch/sun3/sun3x: pmap.c
src/sys/arch/usermode/usermode: machdep.c
src/sys/arch/vax/vax: pmap.c
src/sys/arch/zaurus/zaurus: machdep.c
Log Message:
switch all ports to use uvm_init.c:uvm_md_init()
uvm_setpagesize() is now subsumed within this funciton.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/acorn26/acorn26/start.c
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/acorn32/acorn32/rpc_machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/algor/algor/machdep.c
cvs rdiff -u -r1.347 -r1.348 src/sys/arch/alpha/alpha/machdep.c
cvs rdiff -u -r1.240 -r1.241 src/sys/arch/amd64/amd64/machdep.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amiga/amiga/pmap_bootstrap.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/amigappc/amigappc/machdep.c
cvs rdiff -u -r1.129 -r1.130 src/sys/arch/arc/arc/machdep.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/arm32/arm32_boot.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/at91/at91bus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/atari/atari/pmap_bootstrap.c
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/cobalt/cobalt/machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/emips/emips/machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/epoc32/epoc32/machdep.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/adi_brh/brh_machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/gemini/gemini_machdep.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/imx31/imx31lk_machdep.c
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/evbarm/iq80310/iq80310_machdep.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/evbarm/iq80321/iq80321_machdep.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/lubbock/lubbock_machdep.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/mini2440/mini2440_machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/nslu2/nslu2_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/osk5912/osk5912_machdep.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/tsarm/tsarm_machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/viper/viper_machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbmips/adm5120/machdep.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/evbmips/alchemy/machdep.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbmips/atheros/machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbmips/cavium/machdep.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbmips/gdium/machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbmips/ingenic/machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/loongson/machdep.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/evbmips/malta/machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbmips/rasoc/machdep.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbmips/rmixl/machdep.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbppc/ev64260/machdep.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbppc/mpc85xx/machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/pmppc/machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/ews4800mips/ews4800mips/machdep.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/hpcmips/hpcmips/machdep.c
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/hppa/hppa/pmap.c
cvs rdiff -u -r1.770 -r1.771 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/ia64/ia64/machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/iyonix/iyonix/iyonix_machdep.c
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/m68k/m68k/pmap_motorola.c
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/mipsco/mipsco/machdep.c
cvs rdiff -u -r1.83 -r1.84 \
src/sys/arch/netwinder/netwinder/netwinder_machdep.c
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/newsmips/newsmips/machdep.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/playstation2/playstation2/machdep.c
cvs rdiff -u -r1.250 -r1.251 src/sys/arch/pmax/pmax/machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/powerpc/ibm4xx/pmap.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/powerpc/oea/ofwoea_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/oea/prep_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/rs6000/rs6000/machdep.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/sandpoint/sandpoint/machdep.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/sbmips/sbmips/machdep.c
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/sgimips/sgimips/machdep.c
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/sh3/sh3/sh3_machdep.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/shark/ofw/ofw.c
cvs rdiff -u -r1.360 -r1.361 src/sys/arch/sparc/sparc/pmap.c
cvs rdiff -u -r1.304 -r1.305 src/sys/arch/sparc64/sparc64/pmap.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/sun2/sun2/pmap.c
cvs rdiff -u -r1.170 -r1.171 src/sys/arch/sun3/sun3/pmap.c
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/sun3/sun3x/pmap.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/usermode/usermode/machdep.c
cvs rdiff -u -r1.182 -r1.183 src/sys/arch/vax/vax/pmap.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/zaurus/zaurus/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn26/acorn26/start.c
diff -u src/sys/arch/acorn26/acorn26/start.c:1.20 src/sys/arch/acorn26/acorn26/start.c:1.21
--- src/sys/arch/acorn26/acorn26/start.c:1.20 Sun Aug 18 16:08:42 2013
+++ src/sys/arch/acorn26/acorn26/start.c Thu Dec 22 14:47:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: start.c,v 1.20 2013/08/18 16:08:42 matt Exp $ */
+/* $NetBSD: start.c,v 1.21 2016/12/22 14:47:53 cherry Exp $ */
/*-
* Copyright (c) 1998, 2000 Ben Harris
* All rights reserved.
@@ -31,7 +31,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: start.c,v 1.20 2013/08/18 16:08:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: start.c,v 1.21 2016/12/22 14:47:53 cherry Exp $");
#include "opt_modular.h"
@@ -125,7 +125,7 @@ start(struct bootconfig *initbootconfig)
boothowto = bootconfig.boothowto;
physmem = bootconfig.npages;
uvmexp.pagesize = bootconfig.nbpp;
- uvm_setpagesize();
+ uvm_md_init();
/* Any others? */
Index: src/sys/arch/acorn32/acorn32/rpc_machdep.c
diff -u src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.90 src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.91
--- src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.90 Sat Oct 25 10:58:12 2014
+++ src/sys/arch/acorn32/acorn32/rpc_machdep.c Thu Dec 22 14:47:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_machdep.c,v 1.90 2014/10/25 10:58:12 skrll Exp $ */
+/* $NetBSD: rpc_machdep.c,v 1.91 2016/12/22 14:47:53 cherry Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.90 2014/10/25 10:58:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.91 2016/12/22 14:47:53 cherry Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -924,7 +924,8 @@ initarm(void *cookie)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
+
for (loop = 0; loop < bootconfig.dramblocks; loop++) {
paddr_t start = (paddr_t)bootconfig.dram[loop].address;
paddr_t end = start + (bootconfig.dram[loop].pages * PAGE_SIZE);
Index: src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
diff -u src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.28 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.29
--- src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.28 Sat Oct 25 10:58:12 2014
+++ src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c Thu Dec 22 14:47:53 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: eb7500atx_machdep.c,v 1.28 2014/10/25 10:58:12 skrll Exp $ */
+/* $NetBSD: eb7500atx_machdep.c,v 1.29 2016/12/22 14:47:53 cherry Exp $ */
/*
* Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -55,7 +55,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.28 2014/10/25 10:58:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.29 2016/12/22 14:47:53 cherry Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -862,7 +862,8 @@ initarm(void *cookie)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
+
for (loop = 0; loop < bootconfig.dramblocks; loop++) {
paddr_t start = (paddr_t)bootconfig.dram[loop].address;
paddr_t end = start + (bootconfig.dram[loop].pages * PAGE_SIZE);
Index: src/sys/arch/algor/algor/machdep.c
diff -u src/sys/arch/algor/algor/machdep.c:1.54 src/sys/arch/algor/algor/machdep.c:1.55
--- src/sys/arch/algor/algor/machdep.c:1.54 Tue Jun 30 02:39:03 2015
+++ src/sys/arch/algor/algor/machdep.c Thu Dec 22 14:47:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.54 2015/06/30 02:39:03 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.55 2016/12/22 14:47:54 cherry Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.54 2015/06/30 02:39:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.55 2016/12/22 14:47:54 cherry Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -198,7 +198,7 @@ mach_init(int argc, char *argv[], char *
* Initialize PAGE_SIZE-dependent variables.
*/
led_display('p', 'g', 's', 'z');
- uvm_setpagesize();
+ uvm_md_init();
/*
* Initialize bus space tags and bring up the console.
Index: src/sys/arch/alpha/alpha/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.347 src/sys/arch/alpha/alpha/machdep.c:1.348
--- src/sys/arch/alpha/alpha/machdep.c:1.347 Thu Oct 13 16:18:20 2016
+++ src/sys/arch/alpha/alpha/machdep.c Thu Dec 22 14:47:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.347 2016/10/13 16:18:20 flxd Exp $ */
+/* $NetBSD: machdep.c,v 1.348 2016/12/22 14:47:54 cherry Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.347 2016/10/13 16:18:20 flxd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.348 2016/12/22 14:47:54 cherry Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -372,7 +372,7 @@ nobootinfo:
panic("page size %lu != %d?!", hwrpb->rpb_page_size,
ALPHA_PGBYTES);
uvmexp.pagesize = hwrpb->rpb_page_size;
- uvm_setpagesize();
+ uvm_md_init();
/*
* Find out what hardware we're on, and do basic initialization.
Index: src/sys/arch/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.240 src/sys/arch/amd64/amd64/machdep.c:1.241
--- src/sys/arch/amd64/amd64/machdep.c:1.240 Tue Dec 20 14:03:15 2016
+++ src/sys/arch/amd64/amd64/machdep.c Thu Dec 22 14:47:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.240 2016/12/20 14:03:15 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.241 2016/12/22 14:47:54 cherry Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.240 2016/12/20 14:03:15 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.241 2016/12/22 14:47:54 cherry Exp $");
/* #define XENDEBUG_LOW */
@@ -1581,7 +1581,7 @@ init_x86_64(paddr_t first_avail)
/*
* Initialize PAGE_SIZE-dependent variables.
*/
- uvm_setpagesize();
+ uvm_md_init();
uvmexp.ncolors = 2;
Index: src/sys/arch/amiga/amiga/pmap_bootstrap.c
diff -u src/sys/arch/amiga/amiga/pmap_bootstrap.c:1.9 src/sys/arch/amiga/amiga/pmap_bootstrap.c:1.10
--- src/sys/arch/amiga/amiga/pmap_bootstrap.c:1.9 Sun Dec 6 06:41:29 2009
+++ src/sys/arch/amiga/amiga/pmap_bootstrap.c Thu Dec 22 14:47:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.9 2009/12/06 06:41:29 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.10 2016/12/22 14:47:54 cherry Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.9 2009/12/06 06:41:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.10 2016/12/22 14:47:54 cherry Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,7 +125,7 @@ pmap_bootstrap(paddr_t firstaddr, paddr_
*/
uvmexp.pagesize = NBPG;
- uvm_setpagesize();
+ uvm_md_init();
/*
* May want to check if first segment is Zorro-II?
Index: src/sys/arch/amigappc/amigappc/machdep.c
diff -u src/sys/arch/amigappc/amigappc/machdep.c:1.51 src/sys/arch/amigappc/amigappc/machdep.c:1.52
--- src/sys/arch/amigappc/amigappc/machdep.c:1.51 Wed Feb 15 12:11:42 2012
+++ src/sys/arch/amigappc/amigappc/machdep.c Thu Dec 22 14:47:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.51 2012/02/15 12:11:42 phx Exp $ */
+/* $NetBSD: machdep.c,v 1.52 2016/12/22 14:47:54 cherry Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.51 2012/02/15 12:11:42 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.52 2016/12/22 14:47:54 cherry Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -560,10 +560,7 @@ initppc(u_int startkernel, u_int endkern
/* XXX bus_space_init() not needed here */
- /*
- * Set the page size
- */
- uvm_setpagesize();
+ uvm_md_init();
/*
* Initialize pmap module
Index: src/sys/arch/arc/arc/machdep.c
diff -u src/sys/arch/arc/arc/machdep.c:1.129 src/sys/arch/arc/arc/machdep.c:1.130
--- src/sys/arch/arc/arc/machdep.c:1.129 Tue Jun 30 02:39:03 2015
+++ src/sys/arch/arc/arc/machdep.c Thu Dec 22 14:47:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.129 2015/06/30 02:39:03 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.130 2016/12/22 14:47:54 cherry Exp $ */
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
/*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.129 2015/06/30 02:39:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.130 2016/12/22 14:47:54 cherry Exp $");
#include "opt_ddb.h"
#include "opt_ddbparam.h"
@@ -306,10 +306,7 @@ mach_init(int argc, char *argv[], u_int
}
}
- /*
- * Set the VM page size.
- */
- uvm_setpagesize();
+ uvm_md_init();
/* make sure that we don't call BIOS console from now on */
cn_tab = NULL;
Index: src/sys/arch/arm/arm32/arm32_boot.c
diff -u src/sys/arch/arm/arm32/arm32_boot.c:1.17 src/sys/arch/arm/arm32/arm32_boot.c:1.18
--- src/sys/arch/arm/arm32/arm32_boot.c:1.17 Tue Mar 8 08:01:23 2016
+++ src/sys/arch/arm/arm32/arm32_boot.c Thu Dec 22 14:47:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_boot.c,v 1.17 2016/03/08 08:01:23 skrll Exp $ */
+/* $NetBSD: arm32_boot.c,v 1.18 2016/12/22 14:47:54 cherry Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -123,7 +123,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.17 2016/03/08 08:01:23 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.18 2016/12/22 14:47:54 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -231,7 +231,7 @@ initarm_common(vaddr_t kvm_base, vsize_t
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
#ifdef VERBOSE_INIT_ARM
printf("pmap_physload ");
Index: src/sys/arch/arm/at91/at91bus.c
diff -u src/sys/arch/arm/at91/at91bus.c:1.18 src/sys/arch/arm/at91/at91bus.c:1.19
--- src/sys/arch/arm/at91/at91bus.c:1.18 Sat Sep 13 18:08:38 2014
+++ src/sys/arch/arm/at91/at91bus.c Thu Dec 22 14:47:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: at91bus.c,v 1.18 2014/09/13 18:08:38 matt Exp $ */
+/* $NetBSD: at91bus.c,v 1.19 2016/12/22 14:47:54 cherry Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.18 2014/09/13 18:08:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.19 2016/12/22 14:47:54 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -511,7 +511,7 @@ at91bus_setup(BootConfig *mem)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/atari/atari/pmap_bootstrap.c
diff -u src/sys/arch/atari/atari/pmap_bootstrap.c:1.7 src/sys/arch/atari/atari/pmap_bootstrap.c:1.8
--- src/sys/arch/atari/atari/pmap_bootstrap.c:1.7 Tue Apr 13 09:49:54 2010
+++ src/sys/arch/atari/atari/pmap_bootstrap.c Thu Dec 22 14:47:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.7 2010/04/13 09:49:54 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.8 2016/12/22 14:47:54 cherry Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -108,7 +108,7 @@ pmap_bootstrap(vaddr_t vstart)
* Announce page-size to the VM-system
*/
uvmexp.pagesize = NBPG;
- uvm_setpagesize();
+ uvm_md_init();
/*
* Setup physical address ranges
Index: src/sys/arch/cobalt/cobalt/machdep.c
diff -u src/sys/arch/cobalt/cobalt/machdep.c:1.118 src/sys/arch/cobalt/cobalt/machdep.c:1.119
--- src/sys/arch/cobalt/cobalt/machdep.c:1.118 Wed Jul 27 11:13:14 2016
+++ src/sys/arch/cobalt/cobalt/machdep.c Thu Dec 22 14:47:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.118 2016/07/27 11:13:14 skrll Exp $ */
+/* $NetBSD: machdep.c,v 1.119 2016/12/22 14:47:54 cherry Exp $ */
/*-
* Copyright (c) 2006 Izumi Tsutsui. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.118 2016/07/27 11:13:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.119 2016/12/22 14:47:54 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -252,7 +252,7 @@ mach_init(int32_t memsize32, u_int bim,
if (bi_msg != NULL)
printf("%s: magic=%#x bip=%p\n", bi_msg, bim, bip);
- uvm_setpagesize();
+ uvm_md_init();
/*
* The boot command is passed in the top 512 bytes,
Index: src/sys/arch/emips/emips/machdep.c
diff -u src/sys/arch/emips/emips/machdep.c:1.11 src/sys/arch/emips/emips/machdep.c:1.12
--- src/sys/arch/emips/emips/machdep.c:1.11 Thu Jun 11 08:22:08 2015
+++ src/sys/arch/emips/emips/machdep.c Thu Dec 22 14:47:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.11 2015/06/11 08:22:08 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.12 2016/12/22 14:47:54 cherry Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.11 2015/06/11 08:22:08 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.12 2016/12/22 14:47:54 cherry Exp $");
#include "opt_ddb.h"
@@ -225,10 +225,7 @@ mach_init(int argc, char *argv[], int co
if (bootinfo_msg != NULL)
printf(bootinfo_msg);
#endif
- /*
- * Set the VM page size.
- */
- uvm_setpagesize();
+ uvm_md_init();
/*
* Copy exception-dispatch code down to exception vector.
Index: src/sys/arch/epoc32/epoc32/machdep.c
diff -u src/sys/arch/epoc32/epoc32/machdep.c:1.4 src/sys/arch/epoc32/epoc32/machdep.c:1.5
--- src/sys/arch/epoc32/epoc32/machdep.c:1.4 Sat Sep 13 18:08:40 2014
+++ src/sys/arch/epoc32/epoc32/machdep.c Thu Dec 22 14:47:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.4 2014/09/13 18:08:40 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.5 2016/12/22 14:47:54 cherry Exp $ */
/*
* Copyright (c) 2012, 2013 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.4 2014/09/13 18:08:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.5 2016/12/22 14:47:54 cherry Exp $");
#include "clpscom.h"
#include "clpslcd.h"
@@ -440,7 +440,7 @@ initarm(void *arg)
undefined_init();
/* Load memory into UVM. */
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(
atop(_end_physical), atop(physical_end),
atop(_end_physical), atop(physical_end),
Index: src/sys/arch/evbarm/adi_brh/brh_machdep.c
diff -u src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.43 src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.44
--- src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.43 Sat Sep 13 18:08:38 2014
+++ src/sys/arch/evbarm/adi_brh/brh_machdep.c Thu Dec 22 14:47:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: brh_machdep.c,v 1.43 2014/09/13 18:08:38 matt Exp $ */
+/* $NetBSD: brh_machdep.c,v 1.44 2016/12/22 14:47:55 cherry Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.43 2014/09/13 18:08:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.44 2016/12/22 14:47:55 cherry Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -757,7 +757,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
diff -u src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.28 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.29
--- src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.28 Sat Sep 13 18:08:38 2014
+++ src/sys/arch/evbarm/armadillo/armadillo9_machdep.c Thu Dec 22 14:47:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: armadillo9_machdep.c,v 1.28 2014/09/13 18:08:38 matt Exp $ */
+/* $NetBSD: armadillo9_machdep.c,v 1.29 2016/12/22 14:47:55 cherry Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.28 2014/09/13 18:08:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.29 2016/12/22 14:47:55 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -813,7 +813,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.29 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.30
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.29 Sat Sep 13 18:08:38 2014
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c Thu Dec 22 14:47:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_machdep.c,v 1.29 2014/09/13 18:08:38 matt Exp $ */
+/* $NetBSD: g42xxeb_machdep.c,v 1.30 2016/12/22 14:47:55 cherry Exp $ */
/*
* Copyright (c) 2002, 2003, 2004, 2005 Genetec Corporation.
@@ -828,7 +828,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/gemini/gemini_machdep.c
diff -u src/sys/arch/evbarm/gemini/gemini_machdep.c:1.22 src/sys/arch/evbarm/gemini/gemini_machdep.c:1.23
--- src/sys/arch/evbarm/gemini/gemini_machdep.c:1.22 Sun Aug 18 15:58:20 2013
+++ src/sys/arch/evbarm/gemini/gemini_machdep.c Thu Dec 22 14:47:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_machdep.c,v 1.22 2013/08/18 15:58:20 matt Exp $ */
+/* $NetBSD: gemini_machdep.c,v 1.23 2016/12/22 14:47:55 cherry Exp $ */
/* adapted from:
* NetBSD: sdp24xx_machdep.c,v 1.4 2008/08/27 11:03:10 matt Exp
@@ -129,7 +129,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.22 2013/08/18 15:58:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.23 2016/12/22 14:47:55 cherry Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -707,7 +707,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
#if (GEMINI_RAM_RESV_PBASE != 0)
uvm_page_physload(atop(physical_freestart), atop(GEMINI_RAM_RESV_PBASE),
Index: src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
diff -u src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.22 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.23
--- src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.22 Sat Sep 13 18:08:39 2014
+++ src/sys/arch/evbarm/hdl_g/hdlg_machdep.c Thu Dec 22 14:47:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hdlg_machdep.c,v 1.22 2014/09/13 18:08:39 matt Exp $ */
+/* $NetBSD: hdlg_machdep.c,v 1.23 2016/12/22 14:47:55 cherry Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.22 2014/09/13 18:08:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.23 2016/12/22 14:47:55 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -595,7 +595,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/imx31/imx31lk_machdep.c
diff -u src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.18 src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.19
--- src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.18 Sat Sep 13 18:08:39 2014
+++ src/sys/arch/evbarm/imx31/imx31lk_machdep.c Thu Dec 22 14:47:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31lk_machdep.c,v 1.18 2014/09/13 18:08:39 matt Exp $ */
+/* $NetBSD: imx31lk_machdep.c,v 1.19 2016/12/22 14:47:55 cherry Exp $ */
/*
* Startup routines for the ZOOM iMX31 LITEKIT.
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.18 2014/09/13 18:08:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.19 2016/12/22 14:47:55 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -692,7 +692,7 @@ printf("%s: textsize %#lx, totalsize %#l
/* Load memory into UVM. */
printf("page ");
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/iq80310/iq80310_machdep.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.85 src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.86
--- src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.85 Sat Sep 13 18:08:39 2014
+++ src/sys/arch/evbarm/iq80310/iq80310_machdep.c Thu Dec 22 14:47:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_machdep.c,v 1.85 2014/09/13 18:08:39 matt Exp $ */
+/* $NetBSD: iq80310_machdep.c,v 1.86 2016/12/22 14:47:55 cherry Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.85 2014/09/13 18:08:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.86 2016/12/22 14:47:55 cherry Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -717,7 +717,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/iq80321/iq80321_machdep.c
diff -u src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.55 src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.56
--- src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.55 Sat Sep 13 18:08:39 2014
+++ src/sys/arch/evbarm/iq80321/iq80321_machdep.c Thu Dec 22 14:47:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80321_machdep.c,v 1.55 2014/09/13 18:08:39 matt Exp $ */
+/* $NetBSD: iq80321_machdep.c,v 1.56 2016/12/22 14:47:55 cherry Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.55 2014/09/13 18:08:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.56 2016/12/22 14:47:55 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -742,7 +742,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
diff -u src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.36 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.37
--- src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.36 Thu Mar 5 08:09:44 2015
+++ src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c Thu Dec 22 14:47:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ixdp425_machdep.c,v 1.36 2015/03/05 08:09:44 skrll Exp $ */
+/* $NetBSD: ixdp425_machdep.c,v 1.37 2016/12/22 14:47:55 cherry Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.36 2015/03/05 08:09:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.37 2016/12/22 14:47:55 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -709,7 +709,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
diff -u src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.56 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.57
--- src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.56 Sat Sep 13 18:08:39 2014
+++ src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c Thu Dec 22 14:47:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ixm1200_machdep.c,v 1.56 2014/09/13 18:08:39 matt Exp $ */
+/* $NetBSD: ixm1200_machdep.c,v 1.57 2016/12/22 14:47:55 cherry Exp $ */
/*
* Copyright (c) 2002, 2003
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.56 2014/09/13 18:08:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.57 2016/12/22 14:47:55 cherry Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -676,7 +676,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/lubbock/lubbock_machdep.c
diff -u src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.33 src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.34
--- src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.33 Sat Sep 13 18:08:39 2014
+++ src/sys/arch/evbarm/lubbock/lubbock_machdep.c Thu Dec 22 14:47:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_machdep.c,v 1.33 2014/09/13 18:08:39 matt Exp $ */
+/* $NetBSD: lubbock_machdep.c,v 1.34 2016/12/22 14:47:55 cherry Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.33 2014/09/13 18:08:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.34 2016/12/22 14:47:55 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -899,7 +899,7 @@ initarm(void *arg)
/* Load memory into UVM. */
printf("page ");
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/mini2440/mini2440_machdep.c
diff -u src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.9 src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.10
--- src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.9 Sat Sep 13 18:08:39 2014
+++ src/sys/arch/evbarm/mini2440/mini2440_machdep.c Thu Dec 22 14:47:55 2016
@@ -131,7 +131,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mini2440_machdep.c,v 1.9 2014/09/13 18:08:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mini2440_machdep.c,v 1.10 2016/12/22 14:47:55 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -886,7 +886,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
diff -u src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.20 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.21
--- src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.20 Sat Sep 13 18:08:39 2014
+++ src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c Thu Dec 22 14:47:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: npwr_fc_machdep.c,v 1.20 2014/09/13 18:08:39 matt Exp $ */
+/* $NetBSD: npwr_fc_machdep.c,v 1.21 2016/12/22 14:47:56 cherry Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.20 2014/09/13 18:08:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.21 2016/12/22 14:47:56 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -712,7 +712,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/nslu2/nslu2_machdep.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.26 src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.27
--- src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.26 Thu Mar 5 08:09:44 2015
+++ src/sys/arch/evbarm/nslu2/nslu2_machdep.c Thu Dec 22 14:47:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_machdep.c,v 1.26 2015/03/05 08:09:44 skrll Exp $ */
+/* $NetBSD: nslu2_machdep.c,v 1.27 2016/12/22 14:47:56 cherry Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.26 2015/03/05 08:09:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.27 2016/12/22 14:47:56 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -777,7 +777,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/osk5912/osk5912_machdep.c
diff -u src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.15 src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.16
--- src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.15 Sun Aug 18 15:58:21 2013
+++ src/sys/arch/evbarm/osk5912/osk5912_machdep.c Thu Dec 22 14:47:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: osk5912_machdep.c,v 1.15 2013/08/18 15:58:21 matt Exp $ */
+/* $NetBSD: osk5912_machdep.c,v 1.16 2016/12/22 14:47:56 cherry Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.15 2013/08/18 15:58:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.16 2016/12/22 14:47:56 cherry Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -447,7 +447,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.35 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.36
--- src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.35 Sat Sep 13 18:08:39 2014
+++ src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c Thu Dec 22 14:47:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2410_machdep.c,v 1.35 2014/09/13 18:08:39 matt Exp $ */
+/* $NetBSD: smdk2410_machdep.c,v 1.36 2016/12/22 14:47:56 cherry Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.35 2014/09/13 18:08:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.36 2016/12/22 14:47:56 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -844,7 +844,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.42 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.43
--- src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.42 Sat Sep 13 18:08:39 2014
+++ src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c Thu Dec 22 14:47:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2800_machdep.c,v 1.42 2014/09/13 18:08:39 matt Exp $ */
+/* $NetBSD: smdk2800_machdep.c,v 1.43 2016/12/22 14:47:56 cherry Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Fujitsu Component Limited
@@ -106,7 +106,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.42 2014/09/13 18:08:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.43 2016/12/22 14:47:56 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -761,7 +761,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
diff -u src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.16 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.17
--- src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.16 Sun Aug 18 15:58:21 2013
+++ src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c Thu Dec 22 14:47:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sdp24xx_machdep.c,v 1.16 2013/08/18 15:58:21 matt Exp $ */
+/* $NetBSD: sdp24xx_machdep.c,v 1.17 2016/12/22 14:47:56 cherry Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.16 2013/08/18 15:58:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.17 2016/12/22 14:47:56 cherry Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -541,7 +541,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/tsarm/tsarm_machdep.c
diff -u src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.23 src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.24
--- src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.23 Sat Sep 13 18:08:39 2014
+++ src/sys/arch/evbarm/tsarm/tsarm_machdep.c Thu Dec 22 14:47:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tsarm_machdep.c,v 1.23 2014/09/13 18:08:39 matt Exp $ */
+/* $NetBSD: tsarm_machdep.c,v 1.24 2016/12/22 14:47:56 cherry Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.23 2014/09/13 18:08:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.24 2016/12/22 14:47:56 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -726,7 +726,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbarm/viper/viper_machdep.c
diff -u src/sys/arch/evbarm/viper/viper_machdep.c:1.24 src/sys/arch/evbarm/viper/viper_machdep.c:1.25
--- src/sys/arch/evbarm/viper/viper_machdep.c:1.24 Sat Sep 13 18:08:39 2014
+++ src/sys/arch/evbarm/viper/viper_machdep.c Thu Dec 22 14:47:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: viper_machdep.c,v 1.24 2014/09/13 18:08:39 matt Exp $ */
+/* $NetBSD: viper_machdep.c,v 1.25 2016/12/22 14:47:56 cherry Exp $ */
/*
* Startup routines for the Arcom Viper. Below you can trace the
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.24 2014/09/13 18:08:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.25 2016/12/22 14:47:56 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -746,7 +746,7 @@ initarm(void *arg)
/* Load memory into UVM. */
printf("page ");
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/evbmips/adm5120/machdep.c
diff -u src/sys/arch/evbmips/adm5120/machdep.c:1.24 src/sys/arch/evbmips/adm5120/machdep.c:1.25
--- src/sys/arch/evbmips/adm5120/machdep.c:1.24 Fri Jun 26 22:12:21 2015
+++ src/sys/arch/evbmips/adm5120/machdep.c Thu Dec 22 14:47:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.24 2015/06/26 22:12:21 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.25 2016/12/22 14:47:56 cherry Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.24 2015/06/26 22:12:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.25 2016/12/22 14:47:56 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -292,10 +292,7 @@ mach_init(int argc, char **argv, void *a
*/
mips_vector_init(NULL, false);
- /*
- * Set the VM page size.
- */
- uvm_setpagesize();
+ uvm_md_init();
adm5120_setcpufreq();
Index: src/sys/arch/evbmips/alchemy/machdep.c
diff -u src/sys/arch/evbmips/alchemy/machdep.c:1.55 src/sys/arch/evbmips/alchemy/machdep.c:1.56
--- src/sys/arch/evbmips/alchemy/machdep.c:1.55 Fri Jun 26 22:11:10 2015
+++ src/sys/arch/evbmips/alchemy/machdep.c Thu Dec 22 14:47:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.55 2015/06/26 22:11:10 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.56 2016/12/22 14:47:56 cherry Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.55 2015/06/26 22:11:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.56 2016/12/22 14:47:56 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -179,10 +179,7 @@ mach_init(int argc, char **argv, yamon_e
*/
mips_vector_init(NULL, false);
- /*
- * Set the VM page size.
- */
- uvm_setpagesize();
+ uvm_md_init();
/*
* Use YAMON's CPU frequency if available.
Index: src/sys/arch/evbmips/atheros/machdep.c
diff -u src/sys/arch/evbmips/atheros/machdep.c:1.30 src/sys/arch/evbmips/atheros/machdep.c:1.31
--- src/sys/arch/evbmips/atheros/machdep.c:1.30 Fri Jun 26 22:11:10 2015
+++ src/sys/arch/evbmips/atheros/machdep.c Thu Dec 22 14:47:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.30 2015/06/26 22:11:10 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.31 2016/12/22 14:47:56 cherry Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.30 2015/06/26 22:11:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.31 2016/12/22 14:47:56 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -207,10 +207,7 @@ mach_init(void)
*/
cal_timer();
- /*
- * Set the VM page size.
- */
- uvm_setpagesize();
+ uvm_md_init();
/*
* Look at arguments passed to us and compute boothowto.
Index: src/sys/arch/evbmips/cavium/machdep.c
diff -u src/sys/arch/evbmips/cavium/machdep.c:1.8 src/sys/arch/evbmips/cavium/machdep.c:1.9
--- src/sys/arch/evbmips/cavium/machdep.c:1.8 Thu Oct 20 07:26:03 2016
+++ src/sys/arch/evbmips/cavium/machdep.c Thu Dec 22 14:47:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.8 2016/10/20 07:26:03 martin Exp $ */
+/* $NetBSD: machdep.c,v 1.9 2016/12/22 14:47:56 cherry Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -114,7 +114,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.8 2016/10/20 07:26:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.9 2016/12/22 14:47:56 cherry Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -220,8 +220,7 @@ mach_init(uint64_t arg0, uint64_t arg1,
mach_init_vector();
- /* set the VM page size */
- uvm_setpagesize();
+ uvm_md_init();
mach_init_bus_space();
Index: src/sys/arch/evbmips/gdium/machdep.c
diff -u src/sys/arch/evbmips/gdium/machdep.c:1.19 src/sys/arch/evbmips/gdium/machdep.c:1.20
--- src/sys/arch/evbmips/gdium/machdep.c:1.19 Mon Jul 11 16:18:56 2016
+++ src/sys/arch/evbmips/gdium/machdep.c Thu Dec 22 14:47:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.19 2016/07/11 16:18:56 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.20 2016/12/22 14:47:56 cherry Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.19 2016/07/11 16:18:56 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.20 2016/12/22 14:47:56 cherry Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -235,8 +235,7 @@ mach_init(int argc, char **argv, char **
*/
mips_vector_init(NULL, false);
- /* set the VM page size */
- uvm_setpagesize();
+ uvm_md_init();
memsize = 256*1024*1024;
physmem = btoc(memsize);
Index: src/sys/arch/evbmips/ingenic/machdep.c
diff -u src/sys/arch/evbmips/ingenic/machdep.c:1.11 src/sys/arch/evbmips/ingenic/machdep.c:1.12
--- src/sys/arch/evbmips/ingenic/machdep.c:1.11 Fri Aug 26 13:53:36 2016
+++ src/sys/arch/evbmips/ingenic/machdep.c Thu Dec 22 14:47:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.11 2016/08/26 13:53:36 skrll Exp $ */
+/* $NetBSD: machdep.c,v 1.12 2016/12/22 14:47:57 cherry Exp $ */
/*-
* Copyright (c) 2014 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.11 2016/08/26 13:53:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.12 2016/12/22 14:47:57 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -176,7 +176,7 @@ mach_init(void)
cpu_setmodel("Ingenic XBurst");
mips_vector_init(NULL, false);
cal_timer();
- uvm_setpagesize();
+ uvm_md_init();
/*
* Look at arguments passed to us and compute boothowto.
*/
Index: src/sys/arch/evbmips/loongson/machdep.c
diff -u src/sys/arch/evbmips/loongson/machdep.c:1.6 src/sys/arch/evbmips/loongson/machdep.c:1.7
--- src/sys/arch/evbmips/loongson/machdep.c:1.6 Mon Mar 24 20:06:31 2014
+++ src/sys/arch/evbmips/loongson/machdep.c Thu Dec 22 14:47:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.6 2014/03/24 20:06:31 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.7 2016/12/22 14:47:57 cherry Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.6 2014/03/24 20:06:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.7 2016/12/22 14:47:57 cherry Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -316,9 +316,8 @@ mach_init(int32_t argc, int32_t argva, i
DPRINTF(("mips_vector_init "));
mips_vector_init(NULL, false);
- DPRINTF(("uvm_setpagesize\n"));
- /* set the VM page size */
- uvm_setpagesize();
+ DPRINTF(("uvm_md_init\n"));
+ uvm_md_init();
#if NKSYMS || defined(DDB) || defined(MODULAR)
//ksyms_addsyms_elf((vaddr_t)esym - (vaddr_t)ssym, ssym, esym);
#endif
Index: src/sys/arch/evbmips/malta/machdep.c
diff -u src/sys/arch/evbmips/malta/machdep.c:1.45 src/sys/arch/evbmips/malta/machdep.c:1.46
--- src/sys/arch/evbmips/malta/machdep.c:1.45 Mon Jul 11 16:18:56 2016
+++ src/sys/arch/evbmips/malta/machdep.c Thu Dec 22 14:47:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.45 2016/07/11 16:18:56 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.46 2016/12/22 14:47:57 cherry Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.45 2016/07/11 16:18:56 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.46 2016/12/22 14:47:57 cherry Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -181,8 +181,7 @@ mach_init(int argc, char **argv, yamon_e
*/
mips_vector_init(NULL, false);
- /* set the VM page size */
- uvm_setpagesize();
+ uvm_md_init();
physmem = btoc(memsize);
Index: src/sys/arch/evbmips/rasoc/machdep.c
diff -u src/sys/arch/evbmips/rasoc/machdep.c:1.12 src/sys/arch/evbmips/rasoc/machdep.c:1.13
--- src/sys/arch/evbmips/rasoc/machdep.c:1.12 Wed Oct 5 15:54:58 2016
+++ src/sys/arch/evbmips/rasoc/machdep.c Thu Dec 22 14:47:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.12 2016/10/05 15:54:58 ryo Exp $ */
+/* $NetBSD: machdep.c,v 1.13 2016/12/22 14:47:57 cherry Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.12 2016/10/05 15:54:58 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13 2016/12/22 14:47:57 cherry Exp $");
#include <sys/param.h>
#include <sys/boot_flag.h>
@@ -146,10 +146,7 @@ mach_init(void)
*/
cal_timer();
- /*
- * Set the VM page size.
- */
- uvm_setpagesize();
+ uvm_md_init();
/*
* Look at arguments passed to us and compute boothowto.
Index: src/sys/arch/evbmips/rmixl/machdep.c
diff -u src/sys/arch/evbmips/rmixl/machdep.c:1.17 src/sys/arch/evbmips/rmixl/machdep.c:1.18
--- src/sys/arch/evbmips/rmixl/machdep.c:1.17 Tue Jun 30 02:39:03 2015
+++ src/sys/arch/evbmips/rmixl/machdep.c Thu Dec 22 14:47:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.17 2015/06/30 02:39:03 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.18 2016/12/22 14:47:57 cherry Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.17 2015/06/30 02:39:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.18 2016/12/22 14:47:57 cherry Exp $");
#define __INTR_PRIVATE
@@ -265,8 +265,7 @@ mach_init(int argc, int32_t *argv, void
/* get system info from firmware */
memsize = rmixlfw_init(infop);
- /* set the VM page size */
- uvm_setpagesize();
+ uvm_md_init();
physmem = btoc(memsize);
Index: src/sys/arch/evbppc/ev64260/machdep.c
diff -u src/sys/arch/evbppc/ev64260/machdep.c:1.31 src/sys/arch/evbppc/ev64260/machdep.c:1.32
--- src/sys/arch/evbppc/ev64260/machdep.c:1.31 Tue Feb 25 14:33:32 2014
+++ src/sys/arch/evbppc/ev64260/machdep.c Thu Dec 22 14:47:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.31 2014/02/25 14:33:32 martin Exp $ */
+/* $NetBSD: machdep.c,v 1.32 2016/12/22 14:47:57 cherry Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.31 2014/02/25 14:33:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.32 2016/12/22 14:47:57 cherry Exp $");
#include "opt_marvell.h"
#include "opt_modular.h"
@@ -224,10 +224,7 @@ initppc(u_int startkernel, u_int endkern
consinit();
- /*
- * Set the page size.
- */
- uvm_setpagesize();
+ uvm_md_init();
/*
* Initialize pmap module.
Index: src/sys/arch/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.41 src/sys/arch/evbppc/mpc85xx/machdep.c:1.42
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.41 Fri Jan 30 15:04:35 2015
+++ src/sys/arch/evbppc/mpc85xx/machdep.c Thu Dec 22 14:47:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.41 2015/01/30 15:04:35 nonaka Exp $ */
+/* $NetBSD: machdep.c,v 1.42 2016/12/22 14:47:57 cherry Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -1267,10 +1267,7 @@ initppc(vaddr_t startkernel, vaddr_t end
mtspr(SPR_TCR, TCR_WIE | mfspr(SPR_TCR));
- /*
- * Set the page size.
- */
- uvm_setpagesize();
+ uvm_md_init();
/*
* Initialize the pmap.
Index: src/sys/arch/evbppc/pmppc/machdep.c
diff -u src/sys/arch/evbppc/pmppc/machdep.c:1.12 src/sys/arch/evbppc/pmppc/machdep.c:1.13
--- src/sys/arch/evbppc/pmppc/machdep.c:1.12 Fri Mar 1 18:25:39 2013
+++ src/sys/arch/evbppc/pmppc/machdep.c Thu Dec 22 14:47:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.12 2013/03/01 18:25:39 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.13 2016/12/22 14:47:57 cherry Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.12 2013/03/01 18:25:39 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.13 2016/12/22 14:47:57 cherry Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -218,10 +218,7 @@ initppc(u_int startkernel, u_int endkern
printf("console set up\n");
- /*
- * Set the page size.
- */
- uvm_setpagesize();
+ uvm_md_init();
/*
* Initialize pmap module.
Index: src/sys/arch/ews4800mips/ews4800mips/machdep.c
diff -u src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.26 src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.27
--- src/sys/arch/ews4800mips/ews4800mips/machdep.c:1.26 Mon Mar 24 20:06:32 2014
+++ src/sys/arch/ews4800mips/ews4800mips/machdep.c Thu Dec 22 14:47:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.26 2014/03/24 20:06:32 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.27 2016/12/22 14:47:57 cherry 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.26 2014/03/24 20:06:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.27 2016/12/22 14:47:57 cherry Exp $");
#include "opt_ddb.h"
@@ -110,7 +110,7 @@ mach_init(int argc, char *argv[], struct
option(argc, argv, bi);
- uvm_setpagesize();
+ uvm_md_init();
/* Fill mem_clusters and mem_cluster_cnt */
(*platform.mem_init)(kernel_text,
Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.22 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.23
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.22 Sat Sep 13 18:09:50 2014
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c Thu Dec 22 14:47:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_hpc_machdep.c,v 1.22 2014/09/13 18:09:50 matt Exp $ */
+/* $NetBSD: pxa2x0_hpc_machdep.c,v 1.23 2016/12/22 14:47:57 cherry Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.22 2014/09/13 18:09:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.23 2016/12/22 14:47:57 cherry Exp $");
#include "opt_ddb.h"
#include "opt_dram_pages.h"
@@ -608,7 +608,7 @@ init_pxa2x0(int argc, char **argv, struc
#endif
/* Load memory into UVM. */
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
for (loop = 0; loop < bootconfig.dramblocks; loop++) {
paddr_t dblk_start = (paddr_t)bootconfig.dram[loop].address;
paddr_t dblk_end = dblk_start
Index: src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.10 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.11
--- src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.10 Sat Sep 13 18:09:50 2014
+++ src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c Thu Dec 22 14:47:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x0_hpc_machdep.c,v 1.10 2014/09/13 18:09:50 matt Exp $ */
+/* $NetBSD: sa11x0_hpc_machdep.c,v 1.11 2016/12/22 14:47:57 cherry Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.10 2014/09/13 18:09:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.11 2016/12/22 14:47:57 cherry Exp $");
#include "opt_ddb.h"
#include "opt_dram_pages.h"
@@ -537,7 +537,7 @@ init_sa11x0(int argc, char **argv, struc
#endif
/* Load memory into UVM. */
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
for (loop = 0; loop < bootconfig.dramblocks; loop++) {
paddr_t dblk_start = (paddr_t)bootconfig.dram[loop].address;
paddr_t dblk_end = dblk_start
Index: src/sys/arch/hpcmips/hpcmips/machdep.c
diff -u src/sys/arch/hpcmips/hpcmips/machdep.c:1.120 src/sys/arch/hpcmips/hpcmips/machdep.c:1.121
--- src/sys/arch/hpcmips/hpcmips/machdep.c:1.120 Tue Jun 30 02:39:03 2015
+++ src/sys/arch/hpcmips/hpcmips/machdep.c Thu Dec 22 14:47:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.120 2015/06/30 02:39:03 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.121 2016/12/22 14:47:57 cherry Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.120 2015/06/30 02:39:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.121 2016/12/22 14:47:57 cherry Exp $");
#include "opt_vr41xx.h"
#include "opt_tx39xx.h"
@@ -310,7 +310,7 @@ mach_init(int argc, char *argv[], struct
* Set the VM page size.
*/
uvmexp.pagesize = NBPG; /* Notify the VM system of our page size. */
- uvm_setpagesize();
+ uvm_md_init();
/*
* Copy exception-dispatch code down to exception vector.
Index: src/sys/arch/hppa/hppa/pmap.c
diff -u src/sys/arch/hppa/hppa/pmap.c:1.99 src/sys/arch/hppa/hppa/pmap.c:1.100
--- src/sys/arch/hppa/hppa/pmap.c:1.99 Fri Aug 8 07:30:51 2014
+++ src/sys/arch/hppa/hppa/pmap.c Thu Dec 22 14:47:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.99 2014/08/08 07:30:51 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.100 2016/12/22 14:47:57 cherry Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.99 2014/08/08 07:30:51 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.100 2016/12/22 14:47:57 cherry Exp $");
#include "opt_cputype.h"
@@ -675,7 +675,7 @@ pmap_bootstrap(vaddr_t vstart)
DPRINTF(PDB_FOLLOW|PDB_INIT, ("%s(0x%lx)\n", __func__, vstart));
- uvm_setpagesize();
+ uvm_md_init();
hppa_prot[UVM_PROT_NONE] = TLB_AR_NA;
hppa_prot[UVM_PROT_READ] = TLB_AR_R;
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.770 src/sys/arch/i386/i386/machdep.c:1.771
--- src/sys/arch/i386/i386/machdep.c:1.770 Tue Dec 20 14:03:15 2016
+++ src/sys/arch/i386/i386/machdep.c Thu Dec 22 14:47:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.770 2016/12/20 14:03:15 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.771 2016/12/22 14:47:58 cherry Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.770 2016/12/20 14:03:15 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.771 2016/12/22 14:47:58 cherry Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@@ -1188,10 +1188,7 @@ init386(paddr_t first_avail)
cpu_info_primary.ci_pae_l3_pdir = (pd_entry_t *)(rcr3() + KERNBASE);
#endif /* PAE && !XEN */
- /*
- * Initialize PAGE_SIZE-dependent variables.
- */
- uvm_setpagesize();
+ uvm_md_init();
/*
* Start with 2 color bins -- this is just a guess to get us
Index: src/sys/arch/ia64/ia64/machdep.c
diff -u src/sys/arch/ia64/ia64/machdep.c:1.35 src/sys/arch/ia64/ia64/machdep.c:1.36
--- src/sys/arch/ia64/ia64/machdep.c:1.35 Fri Mar 14 17:45:37 2014
+++ src/sys/arch/ia64/ia64/machdep.c Thu Dec 22 14:47:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.35 2014/03/14 17:45:37 cherry Exp $ */
+/* $NetBSD: machdep.c,v 1.36 2016/12/22 14:47:58 cherry Exp $ */
/*-
* Copyright (c) 2003,2004 Marcel Moolenaar
@@ -465,7 +465,7 @@ ia64_init(void)
*/
uvmexp.pagesize = PAGE_SIZE;
- uvm_setpagesize();
+ uvm_md_init();
/*
Index: src/sys/arch/iyonix/iyonix/iyonix_machdep.c
diff -u src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.24 src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.25
--- src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.24 Sat Sep 13 18:08:39 2014
+++ src/sys/arch/iyonix/iyonix/iyonix_machdep.c Thu Dec 22 14:47:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: iyonix_machdep.c,v 1.24 2014/09/13 18:08:39 matt Exp $ */
+/* $NetBSD: iyonix_machdep.c,v 1.25 2016/12/22 14:47:58 cherry Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.24 2014/09/13 18:08:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.25 2016/12/22 14:47:58 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -780,7 +780,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
Index: src/sys/arch/m68k/m68k/pmap_motorola.c
diff -u src/sys/arch/m68k/m68k/pmap_motorola.c:1.67 src/sys/arch/m68k/m68k/pmap_motorola.c:1.68
--- src/sys/arch/m68k/m68k/pmap_motorola.c:1.67 Fri Oct 25 20:51:14 2013
+++ src/sys/arch/m68k/m68k/pmap_motorola.c Thu Dec 22 14:47:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.c,v 1.67 2013/10/25 20:51:14 martin Exp $ */
+/* $NetBSD: pmap_motorola.c,v 1.68 2016/12/22 14:47:58 cherry Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -119,7 +119,7 @@
#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.67 2013/10/25 20:51:14 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.68 2016/12/22 14:47:58 cherry Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -340,7 +340,7 @@ pmap_bootstrap_finalize(void)
* and they require this earlier.
*/
uvmexp.pagesize = NBPG;
- uvm_setpagesize();
+ uvm_md_init();
#endif
/*
Index: src/sys/arch/mipsco/mipsco/machdep.c
diff -u src/sys/arch/mipsco/mipsco/machdep.c:1.79 src/sys/arch/mipsco/mipsco/machdep.c:1.80
--- src/sys/arch/mipsco/mipsco/machdep.c:1.79 Fri Jun 26 22:55:40 2015
+++ src/sys/arch/mipsco/mipsco/machdep.c Thu Dec 22 14:47:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.79 2015/06/26 22:55:40 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.80 2016/12/22 14:47:58 cherry Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.79 2015/06/26 22:55:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.80 2016/12/22 14:47:58 cherry Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -211,10 +211,7 @@ mach_init(int argc, char *argv[], char *
if (bi_msg != NULL)
printf(bi_msg);
- /*
- * Set the VM page size.
- */
- uvm_setpagesize();
+ uvm_md_init();
/* Find out how much memory is available. */
physmem = memsize_scan(kernend);
Index: src/sys/arch/netwinder/netwinder/netwinder_machdep.c
diff -u src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.83 src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.84
--- src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.83 Sat Sep 13 18:08:39 2014
+++ src/sys/arch/netwinder/netwinder/netwinder_machdep.c Thu Dec 22 14:47:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: netwinder_machdep.c,v 1.83 2014/09/13 18:08:39 matt Exp $ */
+/* $NetBSD: netwinder_machdep.c,v 1.84 2016/12/22 14:47:58 cherry Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.83 2014/09/13 18:08:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.84 2016/12/22 14:47:58 cherry Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -738,7 +738,7 @@ initarm(void *arg)
/* Load memory into UVM. */
printf("page ");
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
/* XXX Always one RAM block -- nuke the loop. */
for (loop = 0; loop < bootconfig.dramblocks; loop++) {
Index: src/sys/arch/newsmips/newsmips/machdep.c
diff -u src/sys/arch/newsmips/newsmips/machdep.c:1.118 src/sys/arch/newsmips/newsmips/machdep.c:1.119
--- src/sys/arch/newsmips/newsmips/machdep.c:1.118 Thu Jul 21 19:49:59 2016
+++ src/sys/arch/newsmips/newsmips/machdep.c Thu Dec 22 14:47:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.118 2016/07/21 19:49:59 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.119 2016/12/22 14:47:58 cherry Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.118 2016/07/21 19:49:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.119 2016/12/22 14:47:58 cherry Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -240,10 +240,7 @@ mach_init(int x_boothowto, int x_bootdev
kernend = (char *)mips_round_page(esym);
#endif
- /*
- * Set the VM page size.
- */
- uvm_setpagesize();
+ uvm_md_init();
boothowto = x_boothowto;
bootdev = x_bootdev;
Index: src/sys/arch/playstation2/playstation2/machdep.c
diff -u src/sys/arch/playstation2/playstation2/machdep.c:1.31 src/sys/arch/playstation2/playstation2/machdep.c:1.32
--- src/sys/arch/playstation2/playstation2/machdep.c:1.31 Tue Jun 30 02:39:04 2015
+++ src/sys/arch/playstation2/playstation2/machdep.c Thu Dec 22 14:47:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.31 2015/06/30 02:39:04 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.32 2016/12/22 14:47:58 cherry Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.31 2015/06/30 02:39:04 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.32 2016/12/22 14:47:58 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kloader.h"
@@ -114,7 +114,8 @@ mach_init(void)
#ifdef DEBUG
bootinfo_dump();
#endif
- uvm_setpagesize();
+ uvm_md_init();
+
physmem = atop(PS2_MEMORY_SIZE);
/*
Index: src/sys/arch/pmax/pmax/machdep.c
diff -u src/sys/arch/pmax/pmax/machdep.c:1.250 src/sys/arch/pmax/pmax/machdep.c:1.251
--- src/sys/arch/pmax/pmax/machdep.c:1.250 Mon Feb 1 17:39:41 2016
+++ src/sys/arch/pmax/pmax/machdep.c Thu Dec 22 14:47:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.250 2016/02/01 17:39:41 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.251 2016/12/22 14:47:58 cherry Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.250 2016/02/01 17:39:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.251 2016/12/22 14:47:58 cherry Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -220,10 +220,7 @@ mach_init(int argc, int32_t *argv32, int
#else
__USE(bootinfo_msg);
#endif
- /*
- * Set the VM page size.
- */
- uvm_setpagesize();
+ uvm_md_init();
/*
* Copy exception-dispatch code down to exception vector.
Index: src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c
diff -u src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.21 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.22
--- src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.21 Fri Dec 16 04:27:03 2016
+++ src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c Thu Dec 22 14:47:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ibm4xx_machdep.c,v 1.21 2016/12/16 04:27:03 rin Exp $ */
+/* $NetBSD: ibm4xx_machdep.c,v 1.22 2016/12/22 14:47:58 cherry 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.21 2016/12/16 04:27:03 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.22 2016/12/22 14:47:58 cherry Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -228,7 +228,7 @@ ibm4xx_init(vaddr_t startkernel, vaddr_t
*/
consinit();
- uvm_setpagesize();
+ uvm_md_init();
/*
* Initialize pmap module.
Index: src/sys/arch/powerpc/ibm4xx/pmap.c
diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.72 src/sys/arch/powerpc/ibm4xx/pmap.c:1.73
--- src/sys/arch/powerpc/ibm4xx/pmap.c:1.72 Fri Jan 27 19:48:39 2012
+++ src/sys/arch/powerpc/ibm4xx/pmap.c Thu Dec 22 14:47:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.72 2012/01/27 19:48:39 para Exp $ */
+/* $NetBSD: pmap.c,v 1.73 2016/12/22 14:47:58 cherry Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.72 2012/01/27 19:48:39 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.73 2016/12/22 14:47:58 cherry Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -294,7 +294,7 @@ pmap_bootstrap(u_int kernelstart, u_int
* Announce page-size to the VM-system
*/
uvmexp.pagesize = NBPG;
- uvm_setpagesize();
+ uvm_md_init();
/*
* Get memory.
Index: src/sys/arch/powerpc/oea/ofwoea_machdep.c
diff -u src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.38 src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.39
--- src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.38 Tue Mar 25 16:41:37 2014
+++ src/sys/arch/powerpc/oea/ofwoea_machdep.c Thu Dec 22 14:47:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwoea_machdep.c,v 1.38 2014/03/25 16:41:37 matt Exp $ */
+/* $NetBSD: ofwoea_machdep.c,v 1.39 2016/12/22 14:47:58 cherry Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.38 2014/03/25 16:41:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.39 2016/12/22 14:47:58 cherry Exp $");
#include "opt_ppcarch.h"
#include "opt_compat_netbsd.h"
@@ -232,7 +232,7 @@ ofwoea_initppc(u_int startkernel, u_int
}
}
- uvm_setpagesize();
+ uvm_md_init();
pmap_bootstrap(startkernel, endkernel);
Index: src/sys/arch/powerpc/oea/prep_machdep.c
diff -u src/sys/arch/powerpc/oea/prep_machdep.c:1.10 src/sys/arch/powerpc/oea/prep_machdep.c:1.11
--- src/sys/arch/powerpc/oea/prep_machdep.c:1.10 Sat Feb 11 13:53:59 2012
+++ src/sys/arch/powerpc/oea/prep_machdep.c Thu Dec 22 14:47:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: prep_machdep.c,v 1.10 2012/02/11 13:53:59 kiyohara Exp $ */
+/* $NetBSD: prep_machdep.c,v 1.11 2016/12/22 14:47:58 cherry Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: prep_machdep.c,v 1.10 2012/02/11 13:53:59 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: prep_machdep.c,v 1.11 2016/12/22 14:47:58 cherry Exp $");
#include "opt_modular.h"
@@ -163,7 +163,7 @@ prep_initppc(u_long startkernel, u_long
consinit();
/* Set the page size */
- uvm_setpagesize();
+ uvm_md_init();
/* Initialize pmap module */
pmap_bootstrap(startkernel, endkernel);
Index: src/sys/arch/rs6000/rs6000/machdep.c
diff -u src/sys/arch/rs6000/rs6000/machdep.c:1.10 src/sys/arch/rs6000/rs6000/machdep.c:1.11
--- src/sys/arch/rs6000/rs6000/machdep.c:1.10 Mon Jun 20 07:18:07 2011
+++ src/sys/arch/rs6000/rs6000/machdep.c Thu Dec 22 14:47:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.10 2011/06/20 07:18:07 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.11 2016/12/22 14:47:59 cherry Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.10 2011/06/20 07:18:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.11 2016/12/22 14:47:59 cherry Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -335,7 +335,7 @@ initppc(u_long startkernel, u_long endke
setled(0x40400000);
/* Initialize pmap module. */
- uvm_setpagesize();
+ uvm_md_init();
pmap_bootstrap(startkernel, endkernel);
setled(0x40500000);
Index: src/sys/arch/sandpoint/sandpoint/machdep.c
diff -u src/sys/arch/sandpoint/sandpoint/machdep.c:1.65 src/sys/arch/sandpoint/sandpoint/machdep.c:1.66
--- src/sys/arch/sandpoint/sandpoint/machdep.c:1.65 Wed Sep 30 14:18:54 2015
+++ src/sys/arch/sandpoint/sandpoint/machdep.c Thu Dec 22 14:47:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.65 2015/09/30 14:18:54 phx Exp $ */
+/* $NetBSD: machdep.c,v 1.66 2016/12/22 14:47:59 cherry Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.65 2015/09/30 14:18:54 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.66 2016/12/22 14:47:59 cherry Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -198,8 +198,7 @@ initppc(u_int startkernel, u_int endkern
/* Initialize the console */
consinit();
- /* Set the page size */
- uvm_setpagesize();
+ uvm_md_init();
/* Initialize pmap module */
pmap_bootstrap(startkernel, endkernel);
Index: src/sys/arch/sbmips/sbmips/machdep.c
diff -u src/sys/arch/sbmips/sbmips/machdep.c:1.53 src/sys/arch/sbmips/sbmips/machdep.c:1.54
--- src/sys/arch/sbmips/sbmips/machdep.c:1.53 Mon Mar 24 19:13:48 2014
+++ src/sys/arch/sbmips/sbmips/machdep.c Thu Dec 22 14:47:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.53 2014/03/24 19:13:48 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.54 2016/12/22 14:47:59 cherry Exp $ */
/*
* Copyright 2000, 2001
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.53 2014/03/24 19:13:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.54 2016/12/22 14:47:59 cherry Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -190,7 +190,7 @@ mach_init(long fwhandle, long magic, lon
consinit();
- uvm_setpagesize();
+ uvm_md_init();
/*
* Copy exception-dispatch code down to exception vector.
Index: src/sys/arch/sgimips/sgimips/machdep.c
diff -u src/sys/arch/sgimips/sgimips/machdep.c:1.142 src/sys/arch/sgimips/sgimips/machdep.c:1.143
--- src/sys/arch/sgimips/sgimips/machdep.c:1.142 Thu Nov 3 22:08:31 2016
+++ src/sys/arch/sgimips/sgimips/machdep.c Thu Dec 22 14:47:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.142 2016/11/03 22:08:31 kamil Exp $ */
+/* $NetBSD: machdep.c,v 1.143 2016/12/22 14:47:59 cherry Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.142 2016/11/03 22:08:31 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.143 2016/12/22 14:47:59 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -287,7 +287,7 @@ mach_init(int argc, int32_t argv32[], ui
cpu_setmodel("%s", arcbios_system_identifier);
- uvm_setpagesize();
+ uvm_md_init();
/* set up bootinfo structures */
if (magic == BOOTINFO_MAGIC && bip != NULL) {
Index: src/sys/arch/sh3/sh3/sh3_machdep.c
diff -u src/sys/arch/sh3/sh3/sh3_machdep.c:1.104 src/sys/arch/sh3/sh3/sh3_machdep.c:1.105
--- src/sys/arch/sh3/sh3/sh3_machdep.c:1.104 Wed Nov 2 00:11:59 2016
+++ src/sys/arch/sh3/sh3/sh3_machdep.c Thu Dec 22 14:47:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sh3_machdep.c,v 1.104 2016/11/02 00:11:59 pgoyette Exp $ */
+/* $NetBSD: sh3_machdep.c,v 1.105 2016/12/22 14:47:59 cherry 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.104 2016/11/02 00:11:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.105 2016/12/22 14:47:59 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -190,9 +190,7 @@ sh_cpu_init(int arch, int product)
/* kernel stack setup */
__sh_switch_resume = CPU_IS_SH3 ? sh3_switch_resume : sh4_switch_resume;
- /* Set page size (4KB) */
- uvm_setpagesize();
-
+ uvm_md_init();
/* setup UBC channel A for single-stepping */
#if defined(PTRACE_HOOKS) || defined(DDB)
_reg_write_2(SH_(BBRA), 0); /* disable channel A */
Index: src/sys/arch/shark/ofw/ofw.c
diff -u src/sys/arch/shark/ofw/ofw.c:1.65 src/sys/arch/shark/ofw/ofw.c:1.66
--- src/sys/arch/shark/ofw/ofw.c:1.65 Thu Jul 7 06:55:38 2016
+++ src/sys/arch/shark/ofw/ofw.c Thu Dec 22 14:47:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw.c,v 1.65 2016/07/07 06:55:38 msaitoh Exp $ */
+/* $NetBSD: ofw.c,v 1.66 2016/12/22 14:47:59 cherry Exp $ */
/*
* Copyright 1997
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.65 2016/07/07 06:55:38 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.66 2016/12/22 14:47:59 cherry Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -871,8 +871,7 @@ ofw_configmem(void)
bootconfig.dramblocks = availcnt;
}
- /* Load memory into UVM. */
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
/* XXX Please kill this code dead. */
for (i = 0; i < bootconfig.dramblocks; i++) {
Index: src/sys/arch/sparc/sparc/pmap.c
diff -u src/sys/arch/sparc/sparc/pmap.c:1.360 src/sys/arch/sparc/sparc/pmap.c:1.361
--- src/sys/arch/sparc/sparc/pmap.c:1.360 Fri Dec 11 19:47:52 2015
+++ src/sys/arch/sparc/sparc/pmap.c Thu Dec 22 14:47:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.360 2015/12/11 19:47:52 macallan Exp $ */
+/* $NetBSD: pmap.c,v 1.361 2016/12/22 14:47:59 cherry Exp $ */
/*
* Copyright (c) 1996
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.360 2015/12/11 19:47:52 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.361 2016/12/22 14:47:59 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -3035,7 +3035,7 @@ pmap_bootstrap(int nctx, int nregion, in
extern char *kernel_top;
uvmexp.pagesize = NBPG;
- uvm_setpagesize();
+ uvm_md_init();
#if defined(SUN4) && (defined(SUN4C) || defined(SUN4M) || defined(SUN4D))
/* In this case NPTESG is a variable */
Index: src/sys/arch/sparc64/sparc64/pmap.c
diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.304 src/sys/arch/sparc64/sparc64/pmap.c:1.305
--- src/sys/arch/sparc64/sparc64/pmap.c:1.304 Fri Nov 4 05:41:01 2016
+++ src/sys/arch/sparc64/sparc64/pmap.c Thu Dec 22 14:47:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.304 2016/11/04 05:41:01 macallan Exp $ */
+/* $NetBSD: pmap.c,v 1.305 2016/12/22 14:47:59 cherry Exp $ */
/*
*
* Copyright (C) 1996-1999 Eduardo Horvath.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.304 2016/11/04 05:41:01 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.305 2016/12/22 14:47:59 cherry Exp $");
#undef NO_VCACHE /* Don't forget the locked TLB in dostart */
#define HWREF
@@ -778,7 +778,7 @@ pmap_bootstrap(u_long kernelstart, u_lon
*/
uvmexp.pagesize = NBPG;
uvmexp.ncolors = pmap_calculate_colors();
- uvm_setpagesize();
+ uvm_md_init();
/*
* Get hold or the message buffer.
Index: src/sys/arch/sun2/sun2/pmap.c
diff -u src/sys/arch/sun2/sun2/pmap.c:1.47 src/sys/arch/sun2/sun2/pmap.c:1.48
--- src/sys/arch/sun2/sun2/pmap.c:1.47 Mon Mar 24 18:50:31 2014
+++ src/sys/arch/sun2/sun2/pmap.c Thu Dec 22 14:47:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.47 2014/03/24 18:50:31 christos Exp $ */
+/* $NetBSD: pmap.c,v 1.48 2016/12/22 14:47:59 cherry Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.47 2014/03/24 18:50:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.48 2016/12/22 14:47:59 cherry Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -1700,7 +1700,7 @@ pmap_bootstrap(vaddr_t nextva)
avail_next = avail_start;
uvmexp.pagesize = NBPG;
- uvm_setpagesize();
+ uvm_md_init();
/* after setting up some structures */
Index: src/sys/arch/sun3/sun3/pmap.c
diff -u src/sys/arch/sun3/sun3/pmap.c:1.170 src/sys/arch/sun3/sun3/pmap.c:1.171
--- src/sys/arch/sun3/sun3/pmap.c:1.170 Thu Nov 7 17:50:18 2013
+++ src/sys/arch/sun3/sun3/pmap.c Thu Dec 22 14:47:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.170 2013/11/07 17:50:18 christos Exp $ */
+/* $NetBSD: pmap.c,v 1.171 2016/12/22 14:47:59 cherry Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.170 2013/11/07 17:50:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.171 2016/12/22 14:47:59 cherry Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -1730,7 +1730,7 @@ pmap_bootstrap(vaddr_t nextva)
avail_next = avail_start;
uvmexp.pagesize = PAGE_SIZE;
- uvm_setpagesize();
+ uvm_md_init();
/* after setting up some structures */
Index: src/sys/arch/sun3/sun3x/pmap.c
diff -u src/sys/arch/sun3/sun3x/pmap.c:1.113 src/sys/arch/sun3/sun3x/pmap.c:1.114
--- src/sys/arch/sun3/sun3x/pmap.c:1.113 Fri Sep 6 17:43:19 2013
+++ src/sys/arch/sun3/sun3x/pmap.c Thu Dec 22 14:47:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.113 2013/09/06 17:43:19 tsutsui Exp $ */
+/* $NetBSD: pmap.c,v 1.114 2016/12/22 14:47:59 cherry Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.113 2013/09/06 17:43:19 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.114 2016/12/22 14:47:59 cherry Exp $");
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
@@ -893,7 +893,7 @@ pmap_bootstrap(vaddr_t nextva)
/* Notify the VM system of our page size. */
uvmexp.pagesize = PAGE_SIZE;
- uvm_setpagesize();
+ uvm_md_init();
pmap_page_upload();
}
Index: src/sys/arch/usermode/usermode/machdep.c
diff -u src/sys/arch/usermode/usermode/machdep.c:1.53 src/sys/arch/usermode/usermode/machdep.c:1.54
--- src/sys/arch/usermode/usermode/machdep.c:1.53 Wed Feb 8 17:55:21 2012
+++ src/sys/arch/usermode/usermode/machdep.c Thu Dec 22 14:47:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.53 2012/02/08 17:55:21 reinoud Exp $ */
+/* $NetBSD: machdep.c,v 1.54 2016/12/22 14:47:59 cherry Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk <rein...@netbsd.org>
@@ -37,7 +37,7 @@
#include "opt_memsize.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.53 2012/02/08 17:55:21 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.54 2016/12/22 14:47:59 cherry Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -213,7 +213,7 @@ main(int argc, char *argv[])
}
boothowto = tmpopt;
- uvm_setpagesize();
+ uvm_md_init();
uvmexp.ncolors = 2;
pmap_bootstrap();
Index: src/sys/arch/vax/vax/pmap.c
diff -u src/sys/arch/vax/vax/pmap.c:1.182 src/sys/arch/vax/vax/pmap.c:1.183
--- src/sys/arch/vax/vax/pmap.c:1.182 Thu Feb 2 18:59:44 2012
+++ src/sys/arch/vax/vax/pmap.c Thu Dec 22 14:48:00 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.182 2012/02/02 18:59:44 para Exp $ */
+/* $NetBSD: pmap.c,v 1.183 2016/12/22 14:48:00 cherry Exp $ */
/*
* Copyright (c) 1994, 1998, 1999, 2003 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.182 2012/02/02 18:59:44 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.183 2016/12/22 14:48:00 cherry Exp $");
#include "opt_ddb.h"
#include "opt_cputype.h"
@@ -302,7 +302,7 @@ pmap_bootstrap(void)
/* Set logical page size */
uvmexp.pagesize = NBPG;
- uvm_setpagesize();
+ uvm_md_init();
physmem = btoc(avail_end);
Index: src/sys/arch/zaurus/zaurus/machdep.c
diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.37 src/sys/arch/zaurus/zaurus/machdep.c:1.38
--- src/sys/arch/zaurus/zaurus/machdep.c:1.37 Thu Jul 7 06:55:40 2016
+++ src/sys/arch/zaurus/zaurus/machdep.c Thu Dec 22 14:48:00 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.37 2016/07/07 06:55:40 msaitoh Exp $ */
+/* $NetBSD: machdep.c,v 1.38 2016/12/22 14:48:00 cherry Exp $ */
/* $OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $ */
/*
@@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.37 2016/07/07 06:55:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38 2016/12/22 14:48:00 cherry Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -1090,7 +1090,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
printf("page ");
#endif
- uvm_setpagesize(); /* initialize PAGE_SIZE-dependent variables */
+ uvm_md_init();
uvm_page_physload(atop(physical_freestart), atop(physical_freeend),
atop(physical_freestart), atop(physical_freeend),
VM_FREELIST_DEFAULT);
