Index: kern_timeout.c =================================================================== --- kern_timeout.c (revision 218709) +++ kern_timeout.c (working copy) @@ -157,7 +157,10 @@ { struct callout_cpu *cc; +#if 0 timeout_cpu = PCPU_GET(cpuid); +#endif + timeout_cpu = 0; cc = CC_CPU(timeout_cpu); /* * Calculate callout wheel size @@ -589,7 +592,9 @@ * Don't allow migration of pre-allocated callouts lest they * become unbalanced. */ +#if 0 if (c->c_flags & CALLOUT_LOCAL_ALLOC) +#endif cpu = c->c_cpu; retry: cc = callout_lock(c); @@ -627,11 +632,13 @@ * If the lock must migrate we have to check the state again as * we can't hold both the new and old locks simultaneously. */ +#if 0 if (c->c_cpu != cpu) { c->c_cpu = cpu; CC_UNLOCK(cc); goto retry; } +#endif if (to_ticks <= 0) to_ticks = 1;