Module Name: src
Committed By: ad
Date: Tue Dec 17 00:51:28 UTC 2019
Modified Files:
src/sys/kern: kern_cpu.c
src/sys/rump/librump/rumpkern: MAINBUS.ioconf
Log Message:
Rump is living up to its name
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/kern/kern_cpu.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpkern/MAINBUS.ioconf
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/kern_cpu.c
diff -u src/sys/kern/kern_cpu.c:1.83 src/sys/kern/kern_cpu.c:1.84
--- src/sys/kern/kern_cpu.c:1.83 Tue Dec 17 00:33:47 2019
+++ src/sys/kern/kern_cpu.c Tue Dec 17 00:51:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_cpu.c,v 1.83 2019/12/17 00:33:47 ad Exp $ */
+/* $NetBSD: kern_cpu.c,v 1.84 2019/12/17 00:51:28 ad Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2012, 2019 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.83 2019/12/17 00:33:47 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.84 2019/12/17 00:51:28 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_cpu_ucode.h"
@@ -100,7 +100,6 @@ CTASSERT(offsetof(struct cpu_info, ci_da
#ifndef _RUMPKERNEL /* XXX temporary */
static void cpu_xc_online(struct cpu_info *, void *);
static void cpu_xc_offline(struct cpu_info *, void *);
-#endif /* ifndef _RUMPKERNEL XXX */
dev_type_ioctl(cpuctl_ioctl);
@@ -118,6 +117,7 @@ const struct cdevsw cpuctl_cdevsw = {
.d_discard = nodiscard,
.d_flag = D_OTHER | D_MPSAFE
};
+#endif /* ifndef _RUMPKERNEL XXX */
kmutex_t cpu_lock __cacheline_aligned;
int ncpu __read_mostly;
Index: src/sys/rump/librump/rumpkern/MAINBUS.ioconf
diff -u src/sys/rump/librump/rumpkern/MAINBUS.ioconf:1.2 src/sys/rump/librump/rumpkern/MAINBUS.ioconf:1.3
--- src/sys/rump/librump/rumpkern/MAINBUS.ioconf:1.2 Mon Dec 16 22:47:55 2019
+++ src/sys/rump/librump/rumpkern/MAINBUS.ioconf Tue Dec 17 00:51:28 2019
@@ -4,6 +4,3 @@ include "conf/files"
include "rump/dev/files.rump"
mainbus0 at root
-
-pseudo-device cpuctl
-
