diff options
Diffstat (limited to 'sys/compat/linux32')
| -rw-r--r-- | sys/compat/linux32/common/linux32_misc.c | 14 | ||||
| -rw-r--r-- | sys/compat/linux32/common/linux32_sysctl.c | 7 |
2 files changed, 5 insertions, 16 deletions
diff --git a/sys/compat/linux32/common/linux32_misc.c b/sys/compat/linux32/common/linux32_misc.c index e1b2a654b46..0fb49b0d216 100644 --- a/sys/compat/linux32/common/linux32_misc.c +++ b/sys/compat/linux32/common/linux32_misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_misc.c,v 1.12 2008/06/18 22:58:21 njoly Exp $ */ +/* $NetBSD: linux32_misc.c,v 1.13 2008/11/12 12:36:10 ad Exp $ */ /*- * Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc. @@ -32,11 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_misc.c,v 1.12 2008/06/18 22:58:21 njoly Exp $"); - -#if defined(_KERNEL_OPT) -#include "opt_ptrace.h" -#endif +__KERNEL_RCSID(0, "$NetBSD: linux32_misc.c,v 1.13 2008/11/12 12:36:10 ad Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -103,7 +99,6 @@ linux32_sys_ptrace(struct lwp *l, const struct linux32_sys_ptrace_args *uap, reg syscallarg(T) addr; syscallarg(T) data; } */ -#if defined(PTRACE) || defined(_LKM) const int *ptr; int request; int error; @@ -128,7 +123,7 @@ linux32_sys_ptrace(struct lwp *l, const struct linux32_sys_ptrace_args *uap, reg if (request == LINUX_PTRACE_CONT && SCARG(uap, addr)==0) SCARG(&pta, addr) = (void *) 1; - error = sys_ptrace(l, &pta, retval); + error = sysent[SYS_ptrace].sy_call(l, &pta, retval); if (error) return error; switch (request) { @@ -148,7 +143,4 @@ linux32_sys_ptrace(struct lwp *l, const struct linux32_sys_ptrace_args *uap, reg ptr++; return EIO; -#else - return ENOSYS; -#endif /* PTRACE || _LKM */ } diff --git a/sys/compat/linux32/common/linux32_sysctl.c b/sys/compat/linux32/common/linux32_sysctl.c index acdb3cd6005..fd0fad70f5d 100644 --- a/sys/compat/linux32/common/linux32_sysctl.c +++ b/sys/compat/linux32/common/linux32_sysctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_sysctl.c,v 1.9 2008/01/07 16:12:53 ad Exp $ */ +/* $NetBSD: linux32_sysctl.c,v 1.10 2008/11/12 12:36:10 ad Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_sysctl.c,v 1.9 2008/01/07 16:12:53 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_sysctl.c,v 1.10 2008/11/12 12:36:10 ad Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -105,9 +105,6 @@ SYSCTL_SETUP(sysctl_emul_linux32_setup, "sysctl emul.linux32 subtree setup") EMUL_LINUX32_KERN_VERSION, CTL_EOL); } -#ifndef _LKM -static -#endif struct sysctlnode linux32_sysctl_root = { .sysctl_flags = SYSCTL_VERSION| CTLFLAG_ROOT|CTLTYPE_NODE|CTLFLAG_READWRITE, |
