[src/yamt-uio_vmspace]: src/sys rename VMSPACE_IS_KERNEL to VMSPACE_IS_KERNEL...

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

details:   https://anonhg.NetBSD.org/src/rev/54657f210cda
branches:  yamt-uio_vmspace
changeset: 586701:54657f210cda
user:      yamt <yamt%NetBSD.org@localhost>
date:      Sun Jan 15 10:44:52 2006 +0000

description:
rename VMSPACE_IS_KERNEL to VMSPACE_IS_KERNEL_P.  ("predicate")
suggested by Matt Thomas.

diffstat:

 sys/kern/kern_subr.c   |  12 ++++++------
 sys/kern/uipc_socket.c |   6 +++---
 sys/nfs/nfs_vnops.c    |   6 +++---
 sys/uvm/uvm_extern.h   |   4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diffs (126 lines):

diff -r 4b6f4524cf17 -r 54657f210cda sys/kern/kern_subr.c
--- a/sys/kern/kern_subr.c      Sun Jan 15 10:24:52 2006 +0000
+++ b/sys/kern/kern_subr.c      Sun Jan 15 10:44:52 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_subr.c,v 1.123.2.4 2005/12/31 16:08:22 yamt Exp $ */
+/*     $NetBSD: kern_subr.c,v 1.123.2.5 2006/01/15 10:44:52 yamt Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.123.2.4 2005/12/31 16:08:22 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.123.2.5 2006/01/15 10:44:52 yamt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_md.h"
@@ -163,7 +163,7 @@
                }
                if (cnt > n)
                        cnt = n;
-               if (!VMSPACE_IS_KERNEL(vm)) {
+               if (!VMSPACE_IS_KERNEL_P(vm)) {
                        if (curcpu()->ci_schedstate.spc_flags &
                            SPCF_SHOULDYIELD)
                                preempt(1);
@@ -227,7 +227,7 @@
                uio->uio_iov++;
                goto again;
        }
-       if (!VMSPACE_IS_KERNEL(uio->uio_vmspace)) {
+       if (!VMSPACE_IS_KERNEL_P(uio->uio_vmspace)) {
                if (subyte(iov->iov_base, c) < 0)
                        return (EFAULT);
        } else {
@@ -253,7 +253,7 @@
        if (len == 0)
                return (0);
 
-       if (VMSPACE_IS_KERNEL(vm)) {
+       if (VMSPACE_IS_KERNEL_P(vm)) {
                return kcopy(uaddr, kaddr, len);
        }
        if (__predict_true(vm == curproc->p_vmspace)) {
@@ -286,7 +286,7 @@
        if (len == 0)
                return (0);
 
-       if (VMSPACE_IS_KERNEL(vm)) {
+       if (VMSPACE_IS_KERNEL_P(vm)) {
                return kcopy(kaddr, uaddr, len);
        }
        if (__predict_true(vm == curproc->p_vmspace)) {
diff -r 4b6f4524cf17 -r 54657f210cda sys/kern/uipc_socket.c
--- a/sys/kern/uipc_socket.c    Sun Jan 15 10:24:52 2006 +0000
+++ b/sys/kern/uipc_socket.c    Sun Jan 15 10:44:52 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_socket.c,v 1.115.2.3 2005/12/31 11:34:26 yamt Exp $       */
+/*     $NetBSD: uipc_socket.c,v 1.115.2.4 2006/01/15 10:44:52 yamt Exp $       */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.115.2.3 2005/12/31 11:34:26 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.115.2.4 2006/01/15 10:44:52 yamt Exp $");
 
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
@@ -390,7 +390,7 @@
        vaddr_t lva, va;
        int npgs, i, error;
 
-       if (VMSPACE_IS_KERNEL(uio->uio_vmspace))
+       if (VMSPACE_IS_KERNEL_P(uio->uio_vmspace))
                return (0);
 
        if (iov->iov_len < (size_t) space)
diff -r 4b6f4524cf17 -r 54657f210cda sys/nfs/nfs_vnops.c
--- a/sys/nfs/nfs_vnops.c       Sun Jan 15 10:24:52 2006 +0000
+++ b/sys/nfs/nfs_vnops.c       Sun Jan 15 10:44:52 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_vnops.c,v 1.230.2.1 2005/12/31 16:29:01 yamt Exp $ */
+/*     $NetBSD: nfs_vnops.c,v 1.230.2.2 2006/01/15 10:44:52 yamt Exp $ */
 
 /*
  * Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.230.2.1 2005/12/31 16:29:01 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.230.2.2 2006/01/15 10:44:52 yamt Exp $");
 
 #include "opt_inet.h"
 #include "opt_nfs.h"
@@ -2492,7 +2492,7 @@
                 * load the directory block into system space, so we can
                 * just look at it directly.
                 */
-               if (!VMSPACE_IS_KERNEL(uio->uio_vmspace) ||
+               if (!VMSPACE_IS_KERNEL_P(uio->uio_vmspace) ||
                    uio->uio_iovcnt != 1)
                        panic("nfs_readdir: lost in space");
                for (nc = 0; ncookies-- &&
diff -r 4b6f4524cf17 -r 54657f210cda sys/uvm/uvm_extern.h
--- a/sys/uvm/uvm_extern.h      Sun Jan 15 10:24:52 2006 +0000
+++ b/sys/uvm/uvm_extern.h      Sun Jan 15 10:44:52 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_extern.h,v 1.108.2.1 2005/12/31 11:21:26 yamt Exp $        */
+/*     $NetBSD: uvm_extern.h,v 1.108.2.2 2006/01/15 10:44:52 yamt Exp $        */
 
 /*
  *
@@ -511,7 +511,7 @@
        caddr_t vm_maxsaddr;    /* user VA at max stack growth */
        caddr_t vm_minsaddr;    /* user VA at top of stack */
 };
-#define        VMSPACE_IS_KERNEL(vm)   VM_MAP_IS_KERNEL(&(vm)->vm_map)
+#define        VMSPACE_IS_KERNEL_P(vm) VM_MAP_IS_KERNEL(&(vm)->vm_map)
 
 #ifdef _KERNEL