From 2e393ab4b1c05849ff6f33ab680b89221884186b Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Fri, 9 Sep 2011 18:42:16 +0200
Subject: [PATCH] kernel: Fix UP remove the "race averted" msg in
 callout_terminate().

---
 sys/kern/kern_timeout.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index e1b695c8b7..33379da852 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -503,10 +503,12 @@ callout_terminate(struct callout *c)
 
 	if (c->c_flags & CALLOUT_DID_INIT) {
 		callout_stop(c);
+#ifdef SMP
 		sc = &softclock_pcpu_ary[c->c_gd->gd_cpuid];
+#else
+		sc = &softclock_pcpu_ary[0];
+#endif
 		if (sc->running == c) {
-			kprintf("callout_terminate: race averted func %p\n",
-				c->c_func);
 			while (sc->running == c)
 				tsleep(&sc->running, 0, "crace", 1);
 		}
-- 
2.41.0