Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rump is living up to its name

Browse Source
This commit is contained in:
ad 2019-12-17 00:51:28 +00:00
parent cae3276510
commit 5b04a37fe9
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/kern_cpu.c
View File

@ -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. * Copyright (c) 2007, 2008, 2009, 2010, 2012, 2019 The NetBSD Foundation, Inc.
@ -56,7 +56,7 @@
*/ */
#include <sys/cdefs.h> #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 #ifdef _KERNEL_OPT
#include "opt_cpu_ucode.h" #include "opt_cpu_ucode.h"
@ -100,7 +100,6 @@ CTASSERT(offsetof(struct cpu_info, ci_data) != 0);
#ifndef _RUMPKERNEL /* XXX temporary */ #ifndef _RUMPKERNEL /* XXX temporary */
static void cpu_xc_online(struct cpu_info *, void *); static void cpu_xc_online(struct cpu_info *, void *);
static void cpu_xc_offline(struct cpu_info *, void *); static void cpu_xc_offline(struct cpu_info *, void *);
#endif /* ifndef _RUMPKERNEL XXX */
dev_type_ioctl(cpuctl_ioctl); dev_type_ioctl(cpuctl_ioctl);
@ -118,6 +117,7 @@ const struct cdevsw cpuctl_cdevsw = {
.d_discard = nodiscard, .d_discard = nodiscard,
.d_flag = D_OTHER | D_MPSAFE .d_flag = D_OTHER | D_MPSAFE
}; };
#endif /* ifndef _RUMPKERNEL XXX */
kmutex_t cpu_lock __cacheline_aligned; kmutex_t cpu_lock __cacheline_aligned;
int ncpu __read_mostly; int ncpu __read_mostly;

3
sys/rump/librump/rumpkern/MAINBUS.ioconf
View File

@ -4,6 +4,3 @@ include "conf/files"
include "rump/dev/files.rump" include "rump/dev/files.rump"
mainbus0 at root mainbus0 at root
pseudo-device cpuctl