[src/trunk]: src/sys/arch/sparc64 Fix build w/o options SUN4V.

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

details:   https://anonhg.NetBSD.org/src/rev/b2f56c185f6d
branches:  trunk
changeset: 982233:b2f56c185f6d
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Mon Apr 05 22:36:27 2021 +0000

description:
Fix build w/o options SUN4V.

diffstat:

 sys/arch/sparc64/include/cpu.h |   7 ++-----
 sys/arch/sparc64/sparc64/cpu.c |  14 +++++++-------
 2 files changed, 9 insertions(+), 12 deletions(-)

diffs (75 lines):

diff -r 7d136722b16e -r b2f56c185f6d sys/arch/sparc64/include/cpu.h
--- a/sys/arch/sparc64/include/cpu.h    Mon Apr 05 13:35:41 2021 +0000
+++ b/sys/arch/sparc64/include/cpu.h    Mon Apr 05 22:36:27 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.131 2021/04/03 17:01:24 palle Exp $ */
+/*     $NetBSD: cpu.h,v 1.132 2021/04/05 22:36:27 nakayama Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -198,7 +198,7 @@
 
        /* TSB description (sun4v). */
        struct tsb_desc         *ci_tsb_desc;
-       
+
        /* MMU Fault Status Area (sun4v).
         * Will be initialized to the physical address of the bottom of
         * the interrupt stack.
@@ -440,9 +440,6 @@
 void   next_tick(long);
 void   next_stick(long);
 void   next_stick_init(void);
-#ifdef SUN4V
-void    cpu_idle_sun4v(void);
-#endif
 /* trap.c */
 void   cpu_vmspace_exec(struct lwp *, vaddr_t, vaddr_t);
 int    rwindow_save(struct lwp *);
diff -r 7d136722b16e -r b2f56c185f6d sys/arch/sparc64/sparc64/cpu.c
--- a/sys/arch/sparc64/sparc64/cpu.c    Mon Apr 05 13:35:41 2021 +0000
+++ b/sys/arch/sparc64/sparc64/cpu.c    Mon Apr 05 22:36:27 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.139 2021/04/03 17:01:24 palle Exp $ */
+/*     $NetBSD: cpu.c,v 1.140 2021/04/05 22:36:27 nakayama Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.139 2021/04/03 17:01:24 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.140 2021/04/05 22:36:27 nakayama Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -95,6 +95,7 @@
 struct pool_cache *fpstate_cache;
 
 static struct cpu_info *alloc_cpuinfo(u_int);
+static void cpu_idle_sun4v(void);
 
 /* The following are used externally (sysctl_hw). */
 char   machine[] = MACHINE;            /* from <machine/param.h> */
@@ -700,16 +701,15 @@
         * cpu_idle setup (currently only necessary for sun4v)
         */
        if (CPU_ISSUN4V) {
-         ci->ci_idlespin = cpu_idle_sun4v;
+               ci->ci_idlespin = cpu_idle_sun4v;
        }
 }
 
-#ifdef SUN4V
-void cpu_idle_sun4v(void)
+static void
+cpu_idle_sun4v(void)
 {
-  hv_cpu_yield();
+       hv_cpu_yield();
 }
-#endif
 
 int
 cpu_myid(void)