Module Name: src Committed By: cegger Date: Tue Apr 21 21:30:01 UTC 2009
Modified Files: src/sys/arch/acorn26/acorn26: pmap.c src/sys/arch/alpha/alpha: pmap.c src/sys/arch/amiga/amiga: pmap.c src/sys/arch/arm/arm32: pmap.c src/sys/arch/atari/atari: pmap.c src/sys/arch/hppa/hppa: pmap.c src/sys/arch/ia64/ia64: pmap.c src/sys/arch/m68k/m68k: pmap_motorola.c src/sys/arch/mips/mips: pmap.c src/sys/arch/powerpc/include/oea: pmap.h src/sys/arch/powerpc/oea: pmap.c src/sys/arch/sh3/sh3: 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: pmap.c src/sys/arch/vax/vax: pmap.c src/sys/arch/x86/x86: bus_dma.c pmap.c src/sys/uvm: uvm_pmap.h Log Message: change pmap flags argument from int to u_int. discussed with christos@ on source-changes-d@ To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/acorn26/acorn26/pmap.c cvs rdiff -u -r1.238 -r1.239 src/sys/arch/alpha/alpha/pmap.c cvs rdiff -u -r1.151 -r1.152 src/sys/arch/amiga/amiga/pmap.c cvs rdiff -u -r1.197 -r1.198 src/sys/arch/arm/arm32/pmap.c cvs rdiff -u -r1.117 -r1.118 src/sys/arch/atari/atari/pmap.c cvs rdiff -u -r1.47 -r1.48 src/sys/arch/hppa/hppa/pmap.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/ia64/ia64/pmap.c cvs rdiff -u -r1.43 -r1.44 src/sys/arch/m68k/m68k/pmap_motorola.c cvs rdiff -u -r1.181 -r1.182 src/sys/arch/mips/mips/pmap.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/include/oea/pmap.h cvs rdiff -u -r1.64 -r1.65 src/sys/arch/powerpc/oea/pmap.c cvs rdiff -u -r1.71 -r1.72 src/sys/arch/sh3/sh3/pmap.c cvs rdiff -u -r1.235 -r1.236 src/sys/arch/sparc64/sparc64/pmap.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/sun2/sun2/pmap.c cvs rdiff -u -r1.159 -r1.160 src/sys/arch/sun3/sun3/pmap.c cvs rdiff -u -r1.103 -r1.104 src/sys/arch/sun3/sun3x/pmap.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/usermode/usermode/pmap.c cvs rdiff -u -r1.167 -r1.168 src/sys/arch/vax/vax/pmap.c cvs rdiff -u -r1.50 -r1.51 src/sys/arch/x86/x86/bus_dma.c cvs rdiff -u -r1.83 -r1.84 src/sys/arch/x86/x86/pmap.c cvs rdiff -u -r1.26 -r1.27 src/sys/uvm/uvm_pmap.h 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/pmap.c diff -u src/sys/arch/acorn26/acorn26/pmap.c:1.26 src/sys/arch/acorn26/acorn26/pmap.c:1.27 --- src/sys/arch/acorn26/acorn26/pmap.c:1.26 Wed Mar 18 16:00:08 2009 +++ src/sys/arch/acorn26/acorn26/pmap.c Tue Apr 21 21:29:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.26 2009/03/18 16:00:08 cegger Exp $ */ +/* $NetBSD: pmap.c,v 1.27 2009/04/21 21:29:58 cegger Exp $ */ /*- * Copyright (c) 1997, 1998, 2000 Ben Harris * All rights reserved. @@ -102,7 +102,7 @@ #include <sys/param.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.26 2009/03/18 16:00:08 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.27 2009/04/21 21:29:58 cegger Exp $"); #include <sys/kernel.h> /* for cold */ #include <sys/malloc.h> @@ -638,7 +638,7 @@ */ int -pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) +pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) { UVMHIST_FUNC("pmap_enter"); @@ -647,7 +647,7 @@ } static int -pmap_enter1(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags, +pmap_enter1(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags, int unmanaged) { int ppn, lpn, s; Index: src/sys/arch/alpha/alpha/pmap.c diff -u src/sys/arch/alpha/alpha/pmap.c:1.238 src/sys/arch/alpha/alpha/pmap.c:1.239 --- src/sys/arch/alpha/alpha/pmap.c:1.238 Wed Dec 10 11:10:18 2008 +++ src/sys/arch/alpha/alpha/pmap.c Tue Apr 21 21:29:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.238 2008/12/10 11:10:18 pooka Exp $ */ +/* $NetBSD: pmap.c,v 1.239 2009/04/21 21:29:58 cegger Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008 The NetBSD Foundation, Inc. @@ -140,7 +140,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.238 2008/12/10 11:10:18 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.239 2009/04/21 21:29:58 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1601,7 +1601,7 @@ * insert this page into the given map NOW. */ int -pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) +pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) { struct vm_page *pg; /* if != NULL, managed page */ pt_entry_t *pte, npte, opte; Index: src/sys/arch/amiga/amiga/pmap.c diff -u src/sys/arch/amiga/amiga/pmap.c:1.151 src/sys/arch/amiga/amiga/pmap.c:1.152 --- src/sys/arch/amiga/amiga/pmap.c:1.151 Wed Mar 18 16:00:09 2009 +++ src/sys/arch/amiga/amiga/pmap.c Tue Apr 21 21:29:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.151 2009/03/18 16:00:09 cegger Exp $ */ +/* $NetBSD: pmap.c,v 1.152 2009/04/21 21:29:58 cegger Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -100,7 +100,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.151 2009/03/18 16:00:09 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.152 2009/04/21 21:29:58 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -920,7 +920,7 @@ extern int kernel_copyback; int -pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) +pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) { u_int *pte; int npte; Index: src/sys/arch/arm/arm32/pmap.c diff -u src/sys/arch/arm/arm32/pmap.c:1.197 src/sys/arch/arm/arm32/pmap.c:1.198 --- src/sys/arch/arm/arm32/pmap.c:1.197 Sun Mar 15 22:20:10 2009 +++ src/sys/arch/arm/arm32/pmap.c Tue Apr 21 21:29:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.197 2009/03/15 22:20:10 cegger Exp $ */ +/* $NetBSD: pmap.c,v 1.198 2009/04/21 21:29:58 cegger Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -212,7 +212,7 @@ #include <machine/param.h> #include <arm/arm32/katelib.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.197 2009/03/15 22:20:10 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.198 2009/04/21 21:29:58 cegger Exp $"); #ifdef PMAP_DEBUG @@ -2743,8 +2743,8 @@ } /* - * void pmap_enter(pmap_t pm, vaddr_t va, paddr_t pa, vm_prot_t prot, - * int flags) + * int pmap_enter(pmap_t pm, vaddr_t va, paddr_t pa, vm_prot_t prot, + * u_int flags) * * Insert the given physical page (p) at * the specified virtual address (v) in the @@ -2755,7 +2755,7 @@ * insert this page into the given map NOW. */ int -pmap_enter(pmap_t pm, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) +pmap_enter(pmap_t pm, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) { struct l2_bucket *l2b; struct vm_page *pg, *opg; Index: src/sys/arch/atari/atari/pmap.c diff -u src/sys/arch/atari/atari/pmap.c:1.117 src/sys/arch/atari/atari/pmap.c:1.118 --- src/sys/arch/atari/atari/pmap.c:1.117 Wed Mar 18 16:00:10 2009 +++ src/sys/arch/atari/atari/pmap.c Tue Apr 21 21:29:59 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.117 2009/03/18 16:00:10 cegger Exp $ */ +/* $NetBSD: pmap.c,v 1.118 2009/04/21 21:29:59 cegger Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -100,7 +100,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.117 2009/03/18 16:00:10 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.118 2009/04/21 21:29:59 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -915,7 +915,7 @@ extern int kernel_copyback; int -pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) +pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) { u_int *pte; int npte; Index: src/sys/arch/hppa/hppa/pmap.c diff -u src/sys/arch/hppa/hppa/pmap.c:1.47 src/sys/arch/hppa/hppa/pmap.c:1.48 --- src/sys/arch/hppa/hppa/pmap.c:1.47 Wed Dec 17 20:51:32 2008 +++ src/sys/arch/hppa/hppa/pmap.c Tue Apr 21 21:29:59 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.47 2008/12/17 20:51:32 cegger Exp $ */ +/* $NetBSD: pmap.c,v 1.48 2009/04/21 21:29:59 cegger Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -164,7 +164,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.47 2008/12/17 20:51:32 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.48 2009/04/21 21:29:59 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1336,7 +1336,7 @@ * for this mapping. */ int -pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) +pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) { struct pv_entry *pv; u_int tlbpage, tlbprot; Index: src/sys/arch/ia64/ia64/pmap.c diff -u src/sys/arch/ia64/ia64/pmap.c:1.19 src/sys/arch/ia64/ia64/pmap.c:1.20 --- src/sys/arch/ia64/ia64/pmap.c:1.19 Wed Mar 18 17:06:44 2009 +++ src/sys/arch/ia64/ia64/pmap.c Tue Apr 21 21:29:59 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.19 2009/03/18 17:06:44 cegger Exp $ */ +/* $NetBSD: pmap.c,v 1.20 2009/04/21 21:29:59 cegger Exp $ */ /*- @@ -85,7 +85,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.19 2009/03/18 17:06:44 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.20 2009/04/21 21:29:59 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1391,7 +1391,7 @@ * insert this page into the given map NOW. */ int -pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) +pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) { pmap_t oldpmap; vaddr_t opa; Index: src/sys/arch/m68k/m68k/pmap_motorola.c diff -u src/sys/arch/m68k/m68k/pmap_motorola.c:1.43 src/sys/arch/m68k/m68k/pmap_motorola.c:1.44 --- src/sys/arch/m68k/m68k/pmap_motorola.c:1.43 Sat Mar 14 21:04:11 2009 +++ src/sys/arch/m68k/m68k/pmap_motorola.c Tue Apr 21 21:29:59 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_motorola.c,v 1.43 2009/03/14 21:04:11 dsl Exp $ */ +/* $NetBSD: pmap_motorola.c,v 1.44 2009/04/21 21:29:59 cegger Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -117,7 +117,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.43 2009/03/14 21:04:11 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.44 2009/04/21 21:29:59 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1128,7 +1128,7 @@ * insert this page into the given map NOW. */ int -pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) +pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) { pt_entry_t *pte; int npte; Index: src/sys/arch/mips/mips/pmap.c diff -u src/sys/arch/mips/mips/pmap.c:1.181 src/sys/arch/mips/mips/pmap.c:1.182 --- src/sys/arch/mips/mips/pmap.c:1.181 Wed Dec 10 11:10:19 2008 +++ src/sys/arch/mips/mips/pmap.c Tue Apr 21 21:29:59 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.181 2008/12/10 11:10:19 pooka Exp $ */ +/* $NetBSD: pmap.c,v 1.182 2009/04/21 21:29:59 cegger Exp $ */ /*- * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.181 2008/12/10 11:10:19 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.182 2009/04/21 21:29:59 cegger Exp $"); /* * Manages physical address maps. @@ -1102,7 +1102,7 @@ * insert this page into the given map NOW. */ int -pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) +pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) { pt_entry_t *pte; u_int npte; Index: src/sys/arch/powerpc/include/oea/pmap.h diff -u src/sys/arch/powerpc/include/oea/pmap.h:1.15 src/sys/arch/powerpc/include/oea/pmap.h:1.16 --- src/sys/arch/powerpc/include/oea/pmap.h:1.15 Sun Dec 28 10:23:11 2008 +++ src/sys/arch/powerpc/include/oea/pmap.h Tue Apr 21 21:29:59 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.15 2008/12/28 10:23:11 he Exp $ */ +/* $NetBSD: pmap.h,v 1.16 2009/04/21 21:29:59 cegger Exp $ */ /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -74,7 +74,7 @@ void (*pmapop_copy)(pmap_t, pmap_t, vaddr_t, vsize_t, vaddr_t); void (*pmapop_update)(pmap_t); void (*pmapop_collect)(pmap_t); - int (*pmapop_enter)(pmap_t, vaddr_t, paddr_t, vm_prot_t, int); + int (*pmapop_enter)(pmap_t, vaddr_t, paddr_t, vm_prot_t, u_int); void (*pmapop_remove)(pmap_t, vaddr_t, vaddr_t); void (*pmapop_kenter_pa)(vaddr_t, paddr_t, vm_prot_t); void (*pmapop_kremove)(vaddr_t, vsize_t); Index: src/sys/arch/powerpc/oea/pmap.c diff -u src/sys/arch/powerpc/oea/pmap.c:1.64 src/sys/arch/powerpc/oea/pmap.c:1.65 --- src/sys/arch/powerpc/oea/pmap.c:1.64 Thu Dec 11 19:30:14 2008 +++ src/sys/arch/powerpc/oea/pmap.c Tue Apr 21 21:29:59 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.64 2008/12/11 19:30:14 pooka Exp $ */ +/* $NetBSD: pmap.c,v 1.65 2009/04/21 21:29:59 cegger Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.64 2008/12/11 19:30:14 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.65 2009/04/21 21:29:59 cegger Exp $"); #define PMAP_NOOPNAMES @@ -219,7 +219,7 @@ STATIC void pmap_copy(pmap_t, pmap_t, vaddr_t, vsize_t, vaddr_t); STATIC void pmap_update(pmap_t); STATIC void pmap_collect(pmap_t); -STATIC int pmap_enter(pmap_t, vaddr_t, paddr_t, vm_prot_t, int); +STATIC int pmap_enter(pmap_t, vaddr_t, paddr_t, vm_prot_t, u_int); STATIC void pmap_remove(pmap_t, vaddr_t, vaddr_t); STATIC void pmap_kenter_pa(vaddr_t, paddr_t, vm_prot_t); STATIC void pmap_kremove(vaddr_t, vsize_t); @@ -1907,7 +1907,7 @@ * Insert physical page at pa into the given pmap at virtual address va. */ int -pmap_enter(pmap_t pm, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) +pmap_enter(pmap_t pm, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) { struct mem_region *mp; struct pvo_head *pvo_head; Index: src/sys/arch/sh3/sh3/pmap.c diff -u src/sys/arch/sh3/sh3/pmap.c:1.71 src/sys/arch/sh3/sh3/pmap.c:1.72 --- src/sys/arch/sh3/sh3/pmap.c:1.71 Wed Mar 18 10:22:36 2009 +++ src/sys/arch/sh3/sh3/pmap.c Tue Apr 21 21:30:00 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.71 2009/03/18 10:22:36 cegger Exp $ */ +/* $NetBSD: pmap.c,v 1.72 2009/04/21 21:30:00 cegger Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.71 2009/03/18 10:22:36 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.72 2009/04/21 21:30:00 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -323,7 +323,7 @@ } int -pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) +pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) { struct vm_page *pg; struct vm_page_md *pvh; Index: src/sys/arch/sparc64/sparc64/pmap.c diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.235 src/sys/arch/sparc64/sparc64/pmap.c:1.236 --- src/sys/arch/sparc64/sparc64/pmap.c:1.235 Wed Mar 18 17:06:47 2009 +++ src/sys/arch/sparc64/sparc64/pmap.c Tue Apr 21 21:30:00 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.235 2009/03/18 17:06:47 cegger Exp $ */ +/* $NetBSD: pmap.c,v 1.236 2009/04/21 21:30:00 cegger Exp $ */ /* * * Copyright (C) 1996-1999 Eduardo Horvath. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.235 2009/03/18 17:06:47 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.236 2009/04/21 21:30:00 cegger Exp $"); #undef NO_VCACHE /* Don't forget the locked TLB in dostart */ #define HWREF @@ -1683,7 +1683,7 @@ */ int -pmap_enter(struct pmap *pm, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) +pmap_enter(struct pmap *pm, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) { pte_t tte; int64_t data; Index: src/sys/arch/sun2/sun2/pmap.c diff -u src/sys/arch/sun2/sun2/pmap.c:1.38 src/sys/arch/sun2/sun2/pmap.c:1.39 --- src/sys/arch/sun2/sun2/pmap.c:1.38 Wed Dec 10 11:10:19 2008 +++ src/sys/arch/sun2/sun2/pmap.c Tue Apr 21 21:30:00 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.38 2008/12/10 11:10:19 pooka Exp $ */ +/* $NetBSD: pmap.c,v 1.39 2009/04/21 21:30:00 cegger Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -82,7 +82,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.38 2008/12/10 11:10:19 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.39 2009/04/21 21:30:00 cegger Exp $"); #include "opt_ddb.h" #include "opt_pmap_debug.h" @@ -1939,7 +1939,7 @@ * insert this page into the given map NOW. */ int -pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) +pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) { int new_pte, s; bool wired = (flags & PMAP_WIRED) != 0; Index: src/sys/arch/sun3/sun3/pmap.c diff -u src/sys/arch/sun3/sun3/pmap.c:1.159 src/sys/arch/sun3/sun3/pmap.c:1.160 --- src/sys/arch/sun3/sun3/pmap.c:1.159 Wed Dec 10 11:10:19 2008 +++ src/sys/arch/sun3/sun3/pmap.c Tue Apr 21 21:30:00 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.159 2008/12/10 11:10:19 pooka Exp $ */ +/* $NetBSD: pmap.c,v 1.160 2009/04/21 21:30:00 cegger Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -80,7 +80,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.159 2008/12/10 11:10:19 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.160 2009/04/21 21:30:00 cegger Exp $"); #include "opt_ddb.h" #include "opt_pmap_debug.h" @@ -1968,7 +1968,7 @@ * insert this page into the given map NOW. */ int -pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) +pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) { int new_pte, s; bool wired = (flags & PMAP_WIRED) != 0; Index: src/sys/arch/sun3/sun3x/pmap.c diff -u src/sys/arch/sun3/sun3x/pmap.c:1.103 src/sys/arch/sun3/sun3x/pmap.c:1.104 --- src/sys/arch/sun3/sun3x/pmap.c:1.103 Wed Mar 18 17:06:47 2009 +++ src/sys/arch/sun3/sun3x/pmap.c Tue Apr 21 21:30:00 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.103 2009/03/18 17:06:47 cegger Exp $ */ +/* $NetBSD: pmap.c,v 1.104 2009/04/21 21:30:00 cegger 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.103 2009/03/18 17:06:47 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.104 2009/04/21 21:30:00 cegger Exp $"); #include "opt_ddb.h" #include "opt_pmap_debug.h" @@ -1662,7 +1662,7 @@ * This function ought to be easier to read. */ int -pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) +pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) { bool insert, managed; /* Marks the need for PV insertion.*/ u_short nidx; /* PV list index */ Index: src/sys/arch/usermode/usermode/pmap.c diff -u src/sys/arch/usermode/usermode/pmap.c:1.1 src/sys/arch/usermode/usermode/pmap.c:1.2 --- src/sys/arch/usermode/usermode/pmap.c:1.1 Sat Dec 29 14:38:37 2007 +++ src/sys/arch/usermode/usermode/pmap.c Tue Apr 21 21:30:00 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.1 2007/12/29 14:38:37 jmcneill Exp $ */ +/* $NetBSD: pmap.c,v 1.2 2009/04/21 21:30:00 cegger Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca> @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.1 2007/12/29 14:38:37 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.2 2009/04/21 21:30:00 cegger Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -150,7 +150,7 @@ } int -pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) +pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) { return 0; } Index: src/sys/arch/vax/vax/pmap.c diff -u src/sys/arch/vax/vax/pmap.c:1.167 src/sys/arch/vax/vax/pmap.c:1.168 --- src/sys/arch/vax/vax/pmap.c:1.167 Wed Mar 18 17:06:48 2009 +++ src/sys/arch/vax/vax/pmap.c Tue Apr 21 21:30:00 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.167 2009/03/18 17:06:48 cegger Exp $ */ +/* $NetBSD: pmap.c,v 1.168 2009/04/21 21:30:00 cegger 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.167 2009/03/18 17:06:48 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.168 2009/04/21 21:30:00 cegger Exp $"); #include "opt_ddb.h" #include "opt_cputype.h" @@ -1056,7 +1056,7 @@ * upgrades mappings to more "rights". */ int -pmap_enter(pmap_t pmap, vaddr_t v, paddr_t p, vm_prot_t prot, int flags) +pmap_enter(pmap_t pmap, vaddr_t v, paddr_t p, vm_prot_t prot, u_int flags) { struct pv_entry *pv, *tmp; int s, newpte, oldpte; Index: src/sys/arch/x86/x86/bus_dma.c diff -u src/sys/arch/x86/x86/bus_dma.c:1.50 src/sys/arch/x86/x86/bus_dma.c:1.51 --- src/sys/arch/x86/x86/bus_dma.c:1.50 Sat Apr 18 08:51:45 2009 +++ src/sys/arch/x86/x86/bus_dma.c Tue Apr 21 21:30:01 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.50 2009/04/18 08:51:45 cegger Exp $ */ +/* $NetBSD: bus_dma.c,v 1.51 2009/04/21 21:30:01 cegger Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2007 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.50 2009/04/18 08:51:45 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.51 2009/04/21 21:30:01 cegger Exp $"); /* * The following is included because _bus_dma_uiomove is derived from @@ -1022,7 +1022,7 @@ int curseg; const uvm_flag_t kmflags = (flags & BUS_DMA_NOWAIT) != 0 ? UVM_KMF_NOWAIT : 0; - int pmapflags = PMAP_WIRED | VM_PROT_READ | VM_PROT_WRITE; + u_int pmapflags = PMAP_WIRED | VM_PROT_READ | VM_PROT_WRITE; size = round_page(size); if (flags & BUS_DMA_NOCACHE) Index: src/sys/arch/x86/x86/pmap.c diff -u src/sys/arch/x86/x86/pmap.c:1.83 src/sys/arch/x86/x86/pmap.c:1.84 --- src/sys/arch/x86/x86/pmap.c:1.83 Sat Apr 18 08:51:45 2009 +++ src/sys/arch/x86/x86/pmap.c Tue Apr 21 21:30:01 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.83 2009/04/18 08:51:45 cegger Exp $ */ +/* $NetBSD: pmap.c,v 1.84 2009/04/21 21:30:01 cegger Exp $ */ /* * Copyright (c) 2007 Manuel Bouyer. @@ -154,7 +154,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.83 2009/04/18 08:51:45 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.84 2009/04/21 21:30:01 cegger Exp $"); #include "opt_user_ldt.h" #include "opt_lockdebug.h" @@ -592,12 +592,12 @@ static bool pmap_is_active(struct pmap *, struct cpu_info *, bool); static void pmap_map_ptes(struct pmap *, struct pmap **, pt_entry_t **, pd_entry_t * const **); -static void pmap_do_remove(struct pmap *, vaddr_t, vaddr_t, int); +static void pmap_do_remove(struct pmap *, vaddr_t, vaddr_t, u_int); static bool pmap_remove_pte(struct pmap *, struct vm_page *, - pt_entry_t *, vaddr_t, int, + pt_entry_t *, vaddr_t, u_int, struct pv_entry **); static pt_entry_t pmap_remove_ptes(struct pmap *, struct vm_page *, - vaddr_t, vaddr_t, vaddr_t, int, + vaddr_t, vaddr_t, vaddr_t, u_int, struct pv_entry **); #define PMAP_REMOVE_ALL 0 /* remove all mappings */ #define PMAP_REMOVE_SKIPWIRED 1 /* skip wired mappings */ @@ -2123,7 +2123,7 @@ /* pmap_pdp_alloc: Allocate a page for the pdp memory pool. */ void * -pmap_pdp_alloc(struct pool *pp, int flags) +pmap_pdp_alloc(struct pool *pp, u_int flags) { return (void *)uvm_km_alloc(kernel_map, PAGE_SIZE * PDP_SIZE, PAGE_SIZE * PDP_SIZE, @@ -3193,7 +3193,7 @@ static pt_entry_t pmap_remove_ptes(struct pmap *pmap, struct vm_page *ptp, vaddr_t ptpva, - vaddr_t startva, vaddr_t endva, int flags, + vaddr_t startva, vaddr_t endva, u_int flags, struct pv_entry **pv_tofree) { struct pv_entry *pve; @@ -3293,7 +3293,7 @@ static bool pmap_remove_pte(struct pmap *pmap, struct vm_page *ptp, pt_entry_t *pte, - vaddr_t va, int flags, struct pv_entry **pv_tofree) + vaddr_t va, u_int flags, struct pv_entry **pv_tofree) { pt_entry_t opte; struct pv_entry *pve; @@ -3383,7 +3383,7 @@ */ static void -pmap_do_remove(struct pmap *pmap, vaddr_t sva, vaddr_t eva, int flags) +pmap_do_remove(struct pmap *pmap, vaddr_t sva, vaddr_t eva, u_int flags) { pt_entry_t *ptes, xpte = 0; pd_entry_t pde; @@ -3999,12 +3999,12 @@ #ifdef XEN int pmap_enter_ma(struct pmap *pmap, vaddr_t va, paddr_t ma, paddr_t pa, - vm_prot_t prot, int flags, int domid) + vm_prot_t prot, u_int flags, int domid) { #else /* XEN */ int pmap_enter(struct pmap *pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, - int flags) + u_int flags) { paddr_t ma = pa; #endif /* XEN */ @@ -4221,7 +4221,7 @@ #ifdef XEN int -pmap_enter(struct pmap *pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) +pmap_enter(struct pmap *pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) { paddr_t ma; Index: src/sys/uvm/uvm_pmap.h diff -u src/sys/uvm/uvm_pmap.h:1.26 src/sys/uvm/uvm_pmap.h:1.27 --- src/sys/uvm/uvm_pmap.h:1.26 Sat Apr 18 08:48:47 2009 +++ src/sys/uvm/uvm_pmap.h Tue Apr 21 21:30:01 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_pmap.h,v 1.26 2009/04/18 08:48:47 cegger Exp $ */ +/* $NetBSD: uvm_pmap.h,v 1.27 2009/04/21 21:30:01 cegger Exp $ */ /* * Copyright (c) 1991, 1993 @@ -135,7 +135,7 @@ #endif struct pmap *pmap_create(void); void pmap_destroy(pmap_t); -int pmap_enter(pmap_t, vaddr_t, paddr_t, vm_prot_t, int); +int pmap_enter(pmap_t, vaddr_t, paddr_t, vm_prot_t, u_int); bool pmap_extract(pmap_t, vaddr_t, paddr_t *); #if defined(PMAP_GROWKERNEL) vaddr_t pmap_growkernel(vaddr_t);