Module Name: src
Committed By: justin
Date: Tue Jul 7 12:38:02 UTC 2015
Modified Files:
src/sys/kern: init_sysctl.c init_sysctl_base.c
src/sys/rump/librump/rumpkern: rump.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/sys/kern/init_sysctl.c
cvs rdiff -u -r1.3 -r1.4 src/sys/kern/init_sysctl_base.c
cvs rdiff -u -r1.321 -r1.322 src/sys/rump/librump/rumpkern/rump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/init_sysctl.c
diff -u src/sys/kern/init_sysctl.c:1.207 src/sys/kern/init_sysctl.c:1.208
--- src/sys/kern/init_sysctl.c:1.207 Wed May 20 11:17:24 2015
+++ src/sys/kern/init_sysctl.c Tue Jul 7 12:38:02 2015
@@ -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
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
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 "
Index: src/sys/kern/init_sysctl_base.c
diff -u src/sys/kern/init_sysctl_base.c:1.3 src/sys/kern/init_sysctl_base.c:1.4
--- src/sys/kern/init_sysctl_base.c:1.3 Tue Feb 25 18:30:11 2014
+++ src/sys/kern/init_sysctl_base.c Tue Jul 7 12:38:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysctl_base.c,v 1.3 2014/02/25 18:30:11 pooka Exp $ */
+/* $NetBSD: init_sysctl_base.c,v 1.4 2015/07/07 12:38:02 justin Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,8 +30,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysctl_base.c,v 1.3 2014/02/25 18:30:11 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysctl_base.c,v 1.4 2015/07/07 12:38:02 justin Exp $");
+#include <sys/cpu.h>
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/kernel.h>
@@ -179,6 +180,18 @@ SYSCTL_SETUP(sysctl_kernbase_setup, "sys
SYSCTL_DESCR("Raw partition of a disk"),
NULL, RAW_PART, NULL, 0,
CTL_KERN, KERN_RAWPARTITION, CTL_EOL);
+ 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, "machine_arch",
+ SYSCTL_DESCR("Machine CPU class"),
+ NULL, 0, machine_arch, 0,
+ CTL_HW, HW_MACHINE_ARCH, CTL_EOL);
}
/*
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.321 src/sys/rump/librump/rumpkern/rump.c:1.322
--- src/sys/rump/librump/rumpkern/rump.c:1.321 Mon Jun 8 12:16:47 2015
+++ src/sys/rump/librump/rumpkern/rump.c Tue Jul 7 12:38:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.321 2015/06/08 12:16:47 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.322 2015/07/07 12:38:02 justin Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.321 2015/06/08 12:16:47 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.322 2015/07/07 12:38:02 justin Exp $");
#include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE
@@ -89,6 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.3
#include "rump_dev_private.h"
char machine[] = MACHINE;
+char machine_arch[] = MACHINE_ARCH;
struct proc *initproc;
