summaryrefslogtreecommitdiff
path: root/sys/kern/init_sysctl.c
diff options
context:
space:
mode:
authorjustin <justin@NetBSD.org>2015-07-07 12:38:02 +0000
committerjustin <justin@NetBSD.org>2015-07-07 12:38:02 +0000
commita4adb082e85c4c661d0e81f2fbc17437c82cb955 (patch)
treedfc8987d6bc9dc68ea2fb0102f2a5a3555329b2e /sys/kern/init_sysctl.c
parent8d7e6218f1107af32122003dc152a20a66bc41fe (diff)
Move hw.machine and hw.machine_arch sysctls to base so rump can use them
This allows uname(3) and uname(1) to work on rump kernels.
Diffstat (limited to 'sys/kern/init_sysctl.c')
-rw-r--r--sys/kern/init_sysctl.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/sys/kern/init_sysctl.c b/sys/kern/init_sysctl.c
index dc3e501569d..715d861298b 100644
--- a/sys/kern/init_sysctl.c
+++ b/sys/kern/init_sysctl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysctl.c,v 1.207 2015/05/20 11:17:24 pooka Exp $ */
+/* $NetBSD: init_sysctl.c,v 1.208 2015/07/07 12:38:02 justin Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.207 2015/05/20 11:17:24 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.208 2015/07/07 12:38:02 justin Exp $");
#include "opt_sysv.h"
#include "opt_compat_netbsd.h"
@@ -615,12 +615,6 @@ SYSCTL_SETUP(sysctl_hw_setup, "sysctl hw subtree setup")
sysctl_createv(clog, 0, NULL, NULL,
CTLFLAG_PERMANENT,
- CTLTYPE_STRING, "machine",
- SYSCTL_DESCR("Machine class"),
- NULL, 0, machine, 0,
- CTL_HW, HW_MACHINE, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
- CTLFLAG_PERMANENT,
CTLTYPE_STRING, "model",
SYSCTL_DESCR("Machine model"),
NULL, 0, __UNCONST(model), 0,
@@ -658,12 +652,6 @@ SYSCTL_SETUP(sysctl_hw_setup, "sysctl hw subtree setup")
NULL, PAGE_SIZE, NULL, 0,
CTL_HW, HW_PAGESIZE, CTL_EOL);
sysctl_createv(clog, 0, NULL, NULL,
- CTLFLAG_PERMANENT,
- CTLTYPE_STRING, "machine_arch",
- SYSCTL_DESCR("Machine CPU class"),
- NULL, 0, machine_arch, 0,
- CTL_HW, HW_MACHINE_ARCH, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE,
CTLTYPE_INT, "alignbytes",
SYSCTL_DESCR("Alignment constraint for all possible "