Module Name: src
Committed By: mrg
Date: Mon Feb 14 10:20:31 UTC 2011
Modified Files:
src/sys/arch/sparc/sparc: timer.c
Log Message:
use schedintr() (not schedintr_4m()) on MP or single CPU configurations.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc/sparc/timer.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/sparc/timer.c
diff -u src/sys/arch/sparc/sparc/timer.c:1.26 src/sys/arch/sparc/sparc/timer.c:1.27
--- src/sys/arch/sparc/sparc/timer.c:1.26 Mon Jan 4 04:21:35 2010
+++ src/sys/arch/sparc/sparc/timer.c Mon Feb 14 10:20:31 2011
@@ -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);
