[src/trunk]: src/sys Rump is living up to its name

[ad <ad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/699f66a7fb98
branches:  trunk
changeset: 967657:699f66a7fb98
user:      ad <ad%NetBSD.org@localhost>
date:      Tue Dec 17 00:51:28 2019 +0000

description:
Rump is living up to its name

diffstat:

 sys/kern/kern_cpu.c                      |  6 +++---
 sys/rump/librump/rumpkern/MAINBUS.ioconf |  3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r 4d5b650f364d -r 699f66a7fb98 sys/kern/kern_cpu.c
--- a/sys/kern/kern_cpu.c       Tue Dec 17 00:33:47 2019 +0000
+++ b/sys/kern/kern_cpu.c       Tue Dec 17 00:51:28 2019 +0000
@@ -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 @@
 #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 @@
        .d_discard = nodiscard,
        .d_flag = D_OTHER | D_MPSAFE
 };
+#endif /* ifndef _RUMPKERNEL XXX */
 
 kmutex_t       cpu_lock                __cacheline_aligned;
 int            ncpu                    __read_mostly;
diff -r 4d5b650f364d -r 699f66a7fb98 sys/rump/librump/rumpkern/MAINBUS.ioconf
--- a/sys/rump/librump/rumpkern/MAINBUS.ioconf  Tue Dec 17 00:33:47 2019 +0000
+++ b/sys/rump/librump/rumpkern/MAINBUS.ioconf  Tue Dec 17 00:51:28 2019 +0000
@@ -4,6 +4,3 @@
 include "rump/dev/files.rump"
 
 mainbus0 at root
-
-pseudo-device   cpuctl
-