[src/trunk]: src/sys/arch/sparc/sparc use schedintr() (not schedintr_4m()) on...

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

details:   https://anonhg.NetBSD.org/src/rev/3e2b7f86ced4
branches:  trunk
changeset: 762044:3e2b7f86ced4
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Feb 14 10:20:31 2011 +0000

description:
use schedintr() (not schedintr_4m()) on MP or single CPU configurations.

diffstat:

 sys/arch/sparc/sparc/timer.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r b8f9f9649d4d -r 3e2b7f86ced4 sys/arch/sparc/sparc/timer.c
--- a/sys/arch/sparc/sparc/timer.c      Mon Feb 14 09:21:33 2011 +0000
+++ b/sys/arch/sparc/sparc/timer.c      Mon Feb 14 10:20:31 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: timer.c,v 1.26 2010/01/04 04:21:35 mrg Exp $ */
+/*     $NetBSD: timer.c,v 1.27 2011/02/14 10:20:31 mrg Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.26 2010/01/04 04:21:35 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.27 2011/02/14 10:20:31 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -208,7 +208,12 @@
 #if defined(SUN4M)
        if (CPU_ISSUN4M) {
                timer_init = timer_init_4m;
-               sched_intr_fn = schedintr_4m;
+#if defined(MULTIPROCESSOR)
+               if (sparc_ncpus > 1)
+                       sched_intr_fn = schedintr_4m;
+               else
+#endif
+                       sched_intr_fn = schedintr;
                level10.ih_fun = clockintr_4m;
                level14.ih_fun = statintr_4m;
                cntr.limit = tmr_ustolim4m(tick);