Module Name: src Committed By: jdolecek Date: Fri Apr 20 18:58:10 UTC 2018
Modified Files: src/sys/uvm: uvm_bio.c uvm_extern.h Log Message: make ubc_alloc() and ubc_release() static, they should not be used outside of ubc_uiomove()/ubc_zeropage(); for now mark as noinline to keep them available as breakpoints To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/sys/uvm/uvm_bio.c cvs rdiff -u -r1.208 -r1.209 src/sys/uvm/uvm_extern.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/uvm/uvm_bio.c diff -u src/sys/uvm/uvm_bio.c:1.93 src/sys/uvm/uvm_bio.c:1.94 --- src/sys/uvm/uvm_bio.c:1.93 Mon Mar 26 21:43:30 2018 +++ src/sys/uvm/uvm_bio.c Fri Apr 20 18:58:10 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_bio.c,v 1.93 2018/03/26 21:43:30 jdolecek Exp $ */ +/* $NetBSD: uvm_bio.c,v 1.94 2018/04/20 18:58:10 jdolecek Exp $ */ /* * Copyright (c) 1998 Chuck Silvers. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.93 2018/03/26 21:43:30 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.94 2018/04/20 18:58:10 jdolecek Exp $"); #include "opt_uvmhist.h" #include "opt_ubc.h" @@ -473,7 +473,7 @@ ubc_find_mapping(struct uvm_object *uobj * ubc_alloc: allocate a file mapping window */ -void * +static void * __noinline ubc_alloc(struct uvm_object *uobj, voff_t offset, vsize_t *lenp, int advice, int flags) { @@ -628,7 +628,7 @@ out: * ubc_release: free a file mapping window. */ -void +static void __noinline ubc_release(void *va, int flags) { struct ubc_map *umap; Index: src/sys/uvm/uvm_extern.h diff -u src/sys/uvm/uvm_extern.h:1.208 src/sys/uvm/uvm_extern.h:1.209 --- src/sys/uvm/uvm_extern.h:1.208 Fri Dec 15 16:03:29 2017 +++ src/sys/uvm/uvm_extern.h Fri Apr 20 18:58:10 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_extern.h,v 1.208 2017/12/15 16:03:29 maya Exp $ */ +/* $NetBSD: uvm_extern.h,v 1.209 2018/04/20 18:58:10 jdolecek Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -218,7 +218,7 @@ b\32UNMAP\0\ #define UVM_PGA_ZERO 0x0002 /* returned page must be zero'd */ /* - * flags for ubc_alloc() + * flags for ubc_uiomove() */ #define UBC_READ 0x001 /* reading from object */ #define UBC_WRITE 0x002 /* writing to object */ @@ -613,9 +613,6 @@ void uao_reference(struct uvm_object * /* uvm_bio.c */ void ubc_init(void); void ubchist_init(void); -void * ubc_alloc(struct uvm_object *, voff_t, vsize_t *, int, - int); -void ubc_release(void *, int); int ubc_uiomove(struct uvm_object *, struct uio *, vsize_t, int, int); void ubc_zerorange(struct uvm_object *, off_t, size_t, int);