[src/trunk]: src/sys/kern Hopefully unbreak the build - now that this is incl...

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

details:   https://anonhg.NetBSD.org/src/rev/4d5b650f364d
branches:  trunk
changeset: 967656:4d5b650f364d
user:      ad <ad%NetBSD.org@localhost>
date:      Tue Dec 17 00:33:47 2019 +0000

description:
Hopefully unbreak the build - now that this is included in rump.

diffstat:

 sys/kern/kern_cpu.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (61 lines):

diff -r 4f8537c62f6d -r 4d5b650f364d sys/kern/kern_cpu.c
--- a/sys/kern/kern_cpu.c       Tue Dec 17 00:17:00 2019 +0000
+++ b/sys/kern/kern_cpu.c       Tue Dec 17 00:33:47 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_cpu.c,v 1.82 2019/12/16 22:47:54 ad Exp $ */
+/*     $NetBSD: kern_cpu.c,v 1.83 2019/12/17 00:33:47 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.82 2019/12/16 22:47:54 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.83 2019/12/17 00:33:47 ad Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_cpu_ucode.h"
@@ -97,8 +97,10 @@
 CTASSERT(offsetof(struct cpu_info, ci_data) != 0);
 #endif
 
+#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);
 
@@ -151,6 +153,7 @@
        kcpuset_set(kcpuset_running, 0);
 }
 
+#ifndef _RUMPKERNEL /* XXX temporary */
 int
 mi_cpu_attach(struct cpu_info *ci)
 {
@@ -308,7 +311,6 @@
        return error;
 }
 
-#ifndef _RUMPKERNEL
 struct cpu_info *
 cpu_lookup(u_int idx)
 {
@@ -331,7 +333,6 @@
 
        return ci;
 }
-#endif
 
 static void
 cpu_xc_offline(struct cpu_info *ci, void *unused)
@@ -474,6 +475,7 @@
        spc->spc_lastmod = time_second;
        return 0;
 }
+#endif /* ifndef _RUMPKERNEL XXX */
 
 int
 cpu_setmodel(const char *fmt, ...)