summaryrefslogtreecommitdiff
path: root/sys/compat/linux/common
diff options
context:
space:
mode:
authorjdolecek <jdolecek@NetBSD.org>2002-04-02 20:23:43 +0000
committerjdolecek <jdolecek@NetBSD.org>2002-04-02 20:23:43 +0000
commitee37f0c7382f8de47fffbfa5d9f0c3531f3dd4fc (patch)
treea1b70d17e26554241ac2e776b2158650e30bcbf2 /sys/compat/linux/common
parentba1c5e4c6b6716b6026af1dc99f7674db2f46b9b (diff)
rename sysctl_linux() to linux_sysctl() and hook it into emul_linux
Diffstat (limited to 'sys/compat/linux/common')
-rw-r--r--sys/compat/linux/common/linux_exec.c5
-rw-r--r--sys/compat/linux/common/linux_exec.h4
-rw-r--r--sys/compat/linux/common/linux_sysctl.c6
3 files changed, 8 insertions, 7 deletions
diff --git a/sys/compat/linux/common/linux_exec.c b/sys/compat/linux/common/linux_exec.c
index 4820e776084..c8ec8c1a2d3 100644
--- a/sys/compat/linux/common/linux_exec.c
+++ b/sys/compat/linux/common/linux_exec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_exec.c,v 1.57 2002/03/16 20:43:53 christos Exp $ */
+/* $NetBSD: linux_exec.c,v 1.58 2002/04/02 20:23:43 jdolecek Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998, 2000 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.57 2002/03/16 20:43:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.58 2002/04/02 20:23:43 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -136,6 +136,7 @@ const struct emul emul_linux = {
#else
LINUX_SYSCALL_FUNCTION,
#endif
+ linux_sysctl,
};
static void
diff --git a/sys/compat/linux/common/linux_exec.h b/sys/compat/linux/common/linux_exec.h
index 50b5348e8da..029e9f34c08 100644
--- a/sys/compat/linux/common/linux_exec.h
+++ b/sys/compat/linux/common/linux_exec.h
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_exec.h,v 1.20 2002/03/21 13:23:48 christos Exp $ */
+/* $NetBSD: linux_exec.h,v 1.21 2002/04/02 20:23:44 jdolecek Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -116,7 +116,7 @@
__BEGIN_DECLS
extern const struct emul emul_linux;
-int sysctl_linux __P((int *, u_int, void *, size_t *, void *, size_t,
+int linux_sysctl __P((int *, u_int, void *, size_t *, void *, size_t,
struct proc *));
void linux_setregs __P((struct proc *, struct exec_package *, u_long));
int exec_linux_aout_makecmds __P((struct proc *, struct exec_package *));
diff --git a/sys/compat/linux/common/linux_sysctl.c b/sys/compat/linux/common/linux_sysctl.c
index 7cb670b492e..b4d53ac76b1 100644
--- a/sys/compat/linux/common/linux_sysctl.c
+++ b/sys/compat/linux/common/linux_sysctl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sysctl.c,v 1.3 2002/03/20 00:27:58 christos Exp $ */
+/* $NetBSD: linux_sysctl.c,v 1.4 2002/04/02 20:23:44 jdolecek Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysctl.c,v 1.3 2002/03/20 00:27:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysctl.c,v 1.4 2002/04/02 20:23:44 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -211,7 +211,7 @@ linux_kern_sysctl(int *name, u_int nlen, void *oldp, size_t *oldlenp,
* kernel related system variables.
*/
int
-sysctl_linux(int *name, u_int nlen, void *oldp, size_t *oldlenp,
+linux_sysctl(int *name, u_int nlen, void *oldp, size_t *oldlenp,
void *newp, size_t newlen, struct proc *p)
{
if (nlen != 2 || name[0] != EMUL_LINUX_KERN)