[src/trunk]: src/sys/uvm make ubc_alloc() and ubc_release() stat...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/329b9b89b1a8
branches:  trunk
changeset: 318399:329b9b89b1a8
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Fri Apr 20 18:58:10 2018 +0000
description:
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

diffstat:

 sys/uvm/uvm_bio.c    |  8 ++++----
 sys/uvm/uvm_extern.h |  7 ++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diffs (64 lines):

diff -r 1cccc67b18f9 -r 329b9b89b1a8 sys/uvm/uvm_bio.c
--- a/sys/uvm/uvm_bio.c Fri Apr 20 18:24:44 2018 +0000
+++ b/sys/uvm/uvm_bio.c Fri Apr 20 18:58:10 2018 +0000
@@ -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_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 @@
  * ubc_release:  free a file mapping window.
  */
 
-void
+static void __noinline
 ubc_release(void *va, int flags)
 {
        struct ubc_map *umap;
diff -r 1cccc67b18f9 -r 329b9b89b1a8 sys/uvm/uvm_extern.h
--- a/sys/uvm/uvm_extern.h      Fri Apr 20 18:24:44 2018 +0000
+++ b/sys/uvm/uvm_extern.h      Fri Apr 20 18:58:10 2018 +0000
@@ -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 @@
 #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 @@
 /* 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);