Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/subr_copy.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/subr_copy.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- src/sys/kern/subr_copy.c	2015/03/28 16:13:38	1.2
+++ src/sys/kern/subr_copy.c	2015/03/29 15:05:34	1.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_copy.c,v 1.2 2015/03/28 16:13:38 riastradh Exp $	*/
+/*	$NetBSD: subr_copy.c,v 1.3 2015/03/29 15:05:34 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_copy.c,v 1.2 2015/03/28 16:13:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_copy.c,v 1.3 2015/03/29 15:05:34 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/fcntl.h>
@@ -211,12 +211,12 @@ copyin_vmspace(struct vmspace *vm, const
 	if (len == 0)
 		return (0);
 
-	if (__predict_true(vm == curproc->p_vmspace)) {
-		return copyin(uaddr, kaddr, len);
-	}
 	if (VMSPACE_IS_KERNEL_P(vm)) {
 		return kcopy(uaddr, kaddr, len);
 	}
+	if (__predict_true(vm == curproc->p_vmspace)) {
+		return copyin(uaddr, kaddr, len);
+	}
 
 	iov.iov_base = kaddr;
 	iov.iov_len = len;
@@ -244,12 +244,12 @@ copyout_vmspace(struct vmspace *vm, cons
 	if (len == 0)
 		return (0);
 
-	if (__predict_true(vm == curproc->p_vmspace)) {
-		return copyout(kaddr, uaddr, len);
-	}
 	if (VMSPACE_IS_KERNEL_P(vm)) {
 		return kcopy(kaddr, uaddr, len);
 	}
+	if (__predict_true(vm == curproc->p_vmspace)) {
+		return copyout(kaddr, uaddr, len);
+	}
 
 	iov.iov_base = __UNCONST(kaddr); /* XXXUNCONST cast away const */
 	iov.iov_len = len;