diff options
| author | atatat <atatat@NetBSD.org> | 2004-03-24 15:34:46 +0000 |
|---|---|---|
| committer | atatat <atatat@NetBSD.org> | 2004-03-24 15:34:46 +0000 |
| commit | 19af35fd0df5c8ac14d33424d02f229f1b939b43 (patch) | |
| tree | d32b234f7940cfe221a39dac1db1ee1054b43905 /sys/compat/linux/common/linux_sysctl.c | |
| parent | 70057f1d4e460e68f1e0ece80dc0f58b3b405373 (diff) | |
Tango on sysctl_createv() and flags. The flags have all been renamed,
and sysctl_createv() now uses more arguments.
Diffstat (limited to 'sys/compat/linux/common/linux_sysctl.c')
| -rw-r--r-- | sys/compat/linux/common/linux_sysctl.c | 53 |
1 files changed, 31 insertions, 22 deletions
diff --git a/sys/compat/linux/common/linux_sysctl.c b/sys/compat/linux/common/linux_sysctl.c index abbe8f4dffc..dbf62c122ed 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.12 2004/03/09 03:13:07 atatat Exp $ */ +/* $NetBSD: linux_sysctl.c,v 1.13 2004/03/24 15:34:52 atatat Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_sysctl.c,v 1.12 2004/03/09 03:13:07 atatat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_sysctl.c,v 1.13 2004/03/24 15:34:52 atatat Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -69,7 +69,8 @@ char linux_version[128] = "#0 Sun Nov 11 11:11:11 MET 2000"; #endif static struct sysctlnode linux_sysctl_root = { - .sysctl_flags = SYSCTL_ROOT|CTLTYPE_NODE, + .sysctl_flags = SYSCTL_VERSION| + CTLFLAG_ROOT|CTLTYPE_NODE|CTLFLAG_READWRITE, .sysctl_num = 0, .sysctl_size = sizeof(struct sysctlnode), .sysctl_name = "(linux_root)", @@ -80,29 +81,31 @@ static struct sysctlnode linux_sysctl_root = { */ SYSCTL_SETUP(linux_sysctl_setup, "linux emulated sysctl subtree setup") { - struct sysctlnode *rnode, *node; + struct sysctlnode *node = &linux_sysctl_root; - rnode = &linux_sysctl_root; - sysctl_createv(SYSCTL_PERMANENT, - CTLTYPE_NODE, "kern", &rnode, + sysctl_createv(clog, 0, &node, &node, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "kern", NULL, NULL, 0, NULL, 0, LINUX_CTL_KERN, CTL_EOL); - node = rnode; - sysctl_createv(SYSCTL_PERMANENT, - CTLTYPE_STRING, "ostype", &node, + sysctl_createv(clog, 0, &node, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_STRING, "ostype", NULL, NULL, 0, linux_sysname, sizeof(linux_sysname), LINUX_KERN_OSTYPE, CTL_EOL); - node = rnode; - sysctl_createv(SYSCTL_PERMANENT, - CTLTYPE_STRING, "osrelease", &node, + sysctl_createv(clog, 0, &node, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_STRING, "osrelease", NULL, NULL, 0, linux_release, sizeof(linux_release), LINUX_KERN_OSRELEASE, CTL_EOL); - node = rnode; - sysctl_createv(SYSCTL_PERMANENT, - CTLTYPE_STRING, "version", &node, + sysctl_createv(clog, 0, &node, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_STRING, "version", NULL, NULL, 0, linux_version, sizeof(linux_version), LINUX_KERN_VERSION, CTL_EOL); + + linux_sysctl_root.sysctl_flags &= ~CTLFLAG_READWRITE; } /* @@ -189,30 +192,36 @@ linux_sys___sysctl(struct lwp *l, void *v, register_t *retval) SYSCTL_SETUP(sysctl_emul_linux_setup, "sysctl emul.linux subtree setup") { - sysctl_createv(SYSCTL_PERMANENT, + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, CTLTYPE_NODE, "emul", NULL, NULL, 0, NULL, 0, CTL_EMUL, CTL_EOL); - sysctl_createv(SYSCTL_PERMANENT, + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, CTLTYPE_NODE, "linux", NULL, NULL, 0, NULL, 0, CTL_EMUL, EMUL_LINUX, CTL_EOL); - sysctl_createv(SYSCTL_PERMANENT, + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, CTLTYPE_NODE, "kern", NULL, NULL, 0, NULL, 0, CTL_EMUL, EMUL_LINUX, EMUL_LINUX_KERN, CTL_EOL); - sysctl_createv(SYSCTL_PERMANENT|SYSCTL_READWRITE, + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_STRING, "ostype", NULL, NULL, 0, linux_sysname, sizeof(linux_sysname), CTL_EMUL, EMUL_LINUX, EMUL_LINUX_KERN, EMUL_LINUX_KERN_OSTYPE, CTL_EOL); - sysctl_createv(SYSCTL_PERMANENT|SYSCTL_READWRITE, + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_STRING, "osrelease", NULL, NULL, 0, linux_release, sizeof(linux_release), CTL_EMUL, EMUL_LINUX, EMUL_LINUX_KERN, EMUL_LINUX_KERN_OSRELEASE, CTL_EOL); - sysctl_createv(SYSCTL_PERMANENT|SYSCTL_READWRITE, + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_STRING, "osversion", NULL, NULL, 0, linux_version, sizeof(linux_version), CTL_EMUL, EMUL_LINUX, EMUL_LINUX_KERN, |
