kernel: Fix UP remove the "race averted" msg in callout_terminate().
authorSascha Wildner <saw@online.de>
Fri, 9 Sep 2011 16:42:16 +0000 (18:42 +0200)
committerSascha Wildner <saw@online.de>
Fri, 9 Sep 2011 16:42:16 +0000 (18:42 +0200)
sys/kern/kern_timeout.c

index e1b695c..33379da 100644 (file)
@@ -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);
                }