[src/yamt-uio_vmspace]: src/sys/kern redo the previous correctly.

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

details:   https://anonhg.NetBSD.org/src/rev/aec809cf6abc
branches:  yamt-uio_vmspace
changeset: 586695:aec809cf6abc
user:      yamt <yamt%NetBSD.org@localhost>
date:      Sat Dec 31 11:34:25 2005 +0000

description:
redo the previous correctly.

diffstat:

 sys/kern/kern_subr.c   |  8 ++++----
 sys/kern/uipc_socket.c |  6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 7b7d576f92f0 -r aec809cf6abc sys/kern/kern_subr.c
--- a/sys/kern/kern_subr.c      Sat Dec 31 11:21:51 2005 +0000
+++ b/sys/kern/kern_subr.c      Sat Dec 31 11:34:25 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_subr.c,v 1.123.2.2 2005/12/31 11:21:51 yamt Exp $ */
+/*     $NetBSD: kern_subr.c,v 1.123.2.3 2005/12/31 11:34:25 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.2 2005/12/31 11:21:51 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.123.2.3 2005/12/31 11:34:25 yamt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_md.h"
@@ -163,7 +163,7 @@
                }
                if (cnt > n)
                        cnt = n;
-               if (!VMSPACE_IS_KERNEL(&vm->vm_map)) {
+               if (!VMSPACE_IS_KERNEL(vm)) {
                        if (curcpu()->ci_schedstate.spc_flags &
                            SPCF_SHOULDYIELD)
                                preempt(1);
@@ -232,7 +232,7 @@
                uio->uio_iov++;
                goto again;
        }
-       if (!VMSPACE_IS_KERNEL(&uio->uio_vmspace->vm_map)) {
+       if (!VMSPACE_IS_KERNEL(uio->uio_vmspace)) {
                if (subyte(iov->iov_base, c) < 0)
                        return (EFAULT);
        } else {
diff -r 7b7d576f92f0 -r aec809cf6abc sys/kern/uipc_socket.c
--- a/sys/kern/uipc_socket.c    Sat Dec 31 11:21:51 2005 +0000
+++ b/sys/kern/uipc_socket.c    Sat Dec 31 11:34:25 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_socket.c,v 1.115.2.2 2005/12/31 11:21:51 yamt Exp $       */
+/*     $NetBSD: uipc_socket.c,v 1.115.2.3 2005/12/31 11:34:26 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.2 2005/12/31 11:21:51 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.115.2.3 2005/12/31 11:34:26 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->vm_map))
+       if (VMSPACE_IS_KERNEL(uio->uio_vmspace))
                return (0);
 
        if (iov->iov_len < (size_t) space)