Module Name: src Committed By: riastradh Date: Sun Mar 29 17:38:31 UTC 2015
Modified Files: src/sys/kern: subr_copy.c Log Message: Back this out, per pooka's request. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 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.4 src/sys/kern/subr_copy.c:1.5 --- src/sys/kern/subr_copy.c:1.4 Sun Mar 29 15:08:03 2015 +++ src/sys/kern/subr_copy.c Sun Mar 29 17:38:31 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_copy.c,v 1.4 2015/03/29 15:08:03 riastradh Exp $ */ +/* $NetBSD: subr_copy.c,v 1.5 2015/03/29 17:38:31 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.4 2015/03/29 15:08:03 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_copy.c,v 1.5 2015/03/29 17:38:31 riastradh Exp $"); #include <sys/param.h> #include <sys/fcntl.h> @@ -211,11 +211,6 @@ copyin_vmspace(struct vmspace *vm, const if (len == 0) return (0); -#ifdef _RUMPKERNEL /* XXX */ - if (__predict_true(vm == curproc->p_vmspace)) { - return copyin(uaddr, kaddr, len); - } -#endif if (VMSPACE_IS_KERNEL_P(vm)) { return kcopy(uaddr, kaddr, len); } @@ -249,11 +244,6 @@ copyout_vmspace(struct vmspace *vm, cons if (len == 0) return (0); -#ifdef _RUMPKERNEL /* XXX */ - if (__predict_true(vm == curproc->p_vmspace)) { - return copyout(kaddr, uaddr, len); - } -#endif if (VMSPACE_IS_KERNEL_P(vm)) { return kcopy(kaddr, uaddr, len); }