Module Name: src
Committed By: riastradh
Date: Sun Mar 29 15:05:34 UTC 2015
Modified Files:
src/sys/kern: subr_copy.c
Log Message:
Back out previous.
It appears to be causing anita install to fail. Evidently
VM_SPACE_IS_KERNEL_P(vm) is not mutually exclusive with `vm ==
curproc->p_vmspace' -- in particular, proc0's VM space is kernel.
Making this work in rump for tests will require another approach.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/kern/subr_copy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_copy.c
diff -u src/sys/kern/subr_copy.c:1.2 src/sys/kern/subr_copy.c:1.3
--- src/sys/kern/subr_copy.c:1.2 Sat Mar 28 16:13:38 2015
+++ src/sys/kern/subr_copy.c Sun Mar 29 15:05:34 2015
@@ -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;
