From 719e2eddb47f6a1ce6415c0503b7dc5f5b6d1523 Mon Sep 17 00:00:00 2001 From: skrll Date: Sun, 16 Aug 2009 14:06:36 +0000 Subject: [PATCH] s/int/u_int/ for flags in pmap_enter and deal with this in rump. Hi cegger. --- sys/arch/sparc/include/pmap.h | 8 ++++---- sys/arch/sparc/sparc/pmap.c | 10 +++++----- sys/rump/librump/rumpkern/pmap_stub.c | 8 +++++--- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/sys/arch/sparc/include/pmap.h b/sys/arch/sparc/include/pmap.h index ebedf5cbb95a..9ffbc60b2374 100644 --- a/sys/arch/sparc/include/pmap.h +++ b/sys/arch/sparc/include/pmap.h @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.84 2008/12/09 20:45:45 pooka Exp $ */ +/* $NetBSD: pmap.h,v 1.85 2009/08/16 14:06:36 skrll Exp $ */ /* * Copyright (c) 1996 @@ -280,7 +280,7 @@ void pmap_remove_all(struct pmap *pm); bool pmap_clear_modify4_4c(struct vm_page *); bool pmap_clear_reference4_4c(struct vm_page *); void pmap_copy_page4_4c(paddr_t, paddr_t); -int pmap_enter4_4c(pmap_t, vaddr_t, paddr_t, vm_prot_t, int); +int pmap_enter4_4c(pmap_t, vaddr_t, paddr_t, vm_prot_t, u_int); bool pmap_extract4_4c(pmap_t, vaddr_t, paddr_t *); bool pmap_is_modified4_4c(struct vm_page *); bool pmap_is_referenced4_4c(struct vm_page *); @@ -300,7 +300,7 @@ bool pmap_clear_reference4m(struct vm_page *); void pmap_copy_page4m(paddr_t, paddr_t); void pmap_copy_page_viking_mxcc(paddr_t, paddr_t); void pmap_copy_page_hypersparc(paddr_t, paddr_t); -int pmap_enter4m(pmap_t, vaddr_t, paddr_t, vm_prot_t, int); +int pmap_enter4m(pmap_t, vaddr_t, paddr_t, vm_prot_t, u_int); bool pmap_extract4m(pmap_t, vaddr_t, paddr_t *); bool pmap_is_modified4m(struct vm_page *); bool pmap_is_referenced4m(struct vm_page *); @@ -346,7 +346,7 @@ void pmap_zero_page_hypersparc(paddr_t); extern bool (*pmap_clear_modify_p)(struct vm_page *); extern bool (*pmap_clear_reference_p)(struct vm_page *); -extern int (*pmap_enter_p)(pmap_t, vaddr_t, paddr_t, vm_prot_t, int); +extern int (*pmap_enter_p)(pmap_t, vaddr_t, paddr_t, vm_prot_t, u_int); extern bool (*pmap_extract_p)(pmap_t, vaddr_t, paddr_t *); extern bool (*pmap_is_modified_p)(struct vm_page *); extern bool (*pmap_is_referenced_p)(struct vm_page *); diff --git a/sys/arch/sparc/sparc/pmap.c b/sys/arch/sparc/sparc/pmap.c index b7f01b48cb94..280218ba2ca6 100644 --- a/sys/arch/sparc/sparc/pmap.c +++ b/sys/arch/sparc/sparc/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.332 2009/08/15 23:45:00 matt Exp $ */ +/* $NetBSD: pmap.c,v 1.333 2009/08/16 14:06:36 skrll Exp $ */ /* * Copyright (c) 1996 @@ -56,7 +56,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.332 2009/08/15 23:45:00 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.333 2009/08/16 14:06:36 skrll Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -569,7 +569,7 @@ static void mmu_setup4m_L3(int, struct segmap *); /* from pmap.h: */ bool (*pmap_clear_modify_p)(struct vm_page *); bool (*pmap_clear_reference_p)(struct vm_page *); -int (*pmap_enter_p)(pmap_t, vaddr_t, paddr_t, vm_prot_t, int); +int (*pmap_enter_p)(pmap_t, vaddr_t, paddr_t, vm_prot_t, u_int); bool (*pmap_extract_p)(pmap_t, vaddr_t, paddr_t *); bool (*pmap_is_modified_p)(struct vm_page *); bool (*pmap_is_referenced_p)(struct vm_page *); @@ -5532,7 +5532,7 @@ pmap_changeprot4m(struct pmap *pm, vaddr_t va, vm_prot_t prot, int flags) int pmap_enter4_4c(struct pmap *pm, vaddr_t va, paddr_t pa, - vm_prot_t prot, int flags) + vm_prot_t prot, u_int flags) { struct vm_page *pg; int pteproto, ctx; @@ -6137,7 +6137,7 @@ pmap_kprotect4_4c(vaddr_t va, vsize_t size, vm_prot_t prot) int pmap_enter4m(struct pmap *pm, vaddr_t va, paddr_t pa, - vm_prot_t prot, int flags) + vm_prot_t prot, u_int flags) { struct vm_page *pg; int pteproto; diff --git a/sys/rump/librump/rumpkern/pmap_stub.c b/sys/rump/librump/rumpkern/pmap_stub.c index c8fce2030a2d..086e9a0a25e3 100644 --- a/sys/rump/librump/rumpkern/pmap_stub.c +++ b/sys/rump/librump/rumpkern/pmap_stub.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_stub.c,v 1.18 2009/08/16 14:02:08 skrll Exp $ */ +/* $NetBSD: pmap_stub.c,v 1.19 2009/08/16 14:06:36 skrll Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap_stub.c,v 1.18 2009/08/16 14:02:08 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_stub.c,v 1.19 2009/08/16 14:06:36 skrll Exp $"); #include @@ -52,6 +52,7 @@ struct pmap *const kernel_pmap_ptr = (struct pmap *const)0x66; #undef pmap_kremove #undef pmap_page_protect #undef pmap_extract +#undef pmap_enter bool pmap_is_modified(struct vm_page *); bool pmap_clear_modify(struct vm_page *); @@ -59,6 +60,7 @@ void pmap_kenter_pa(vaddr_t, paddr_t, vm_prot_t); void pmap_kremove(vaddr_t, vsize_t); void pmap_page_protect(struct vm_page *, vm_prot_t); bool pmap_extract(pmap_t, vaddr_t, paddr_t *); +int pmap_enter(pmap_t, vaddr_t, paddr_t, vm_prot_t, u_int); #endif #if !defined(pmap_is_modified) && !defined(__vax__) @@ -265,5 +267,5 @@ void (*pmap_kenter_pa_p)(vaddr_t, paddr_t, vm_prot_t) = pmap_kenter_pa; void (*pmap_kremove_p)(vaddr_t, vsize_t) = pmap_kremove; void (*pmap_page_protect_p)(struct vm_page *, vm_prot_t)=pmap_page_protect; bool (*pmap_extract_p)(pmap_t, vaddr_t, paddr_t *) = pmap_extract; -int (*pmap_enter_p)(pmap_t, vaddr_t, paddr_t, vm_prot_t, int) = pmap_enter; +int (*pmap_enter_p)(pmap_t, vaddr_t, paddr_t, vm_prot_t, u_int) = pmap_enter; #endif