Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/kern Back this out, per pooka's request.
details: https://anonhg.NetBSD.org/src/rev/03dc1facff5c
branches: trunk
changeset: 336992:03dc1facff5c
user: riastradh <riastradh%NetBSD.org@localhost>
date: Sun Mar 29 17:38:31 2015 +0000
description:
Back this out, per pooka's request.
diffstat:
sys/kern/subr_copy.c | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diffs (42 lines):
diff -r 8f0fa369eb20 -r 03dc1facff5c sys/kern/subr_copy.c
--- a/sys/kern/subr_copy.c Sun Mar 29 15:08:03 2015 +0000
+++ b/sys/kern/subr_copy.c Sun Mar 29 17:38:31 2015 +0000
@@ -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 @@
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 @@
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);
}
Home |
Main Index |
Thread Index |
Old Index