From 27754ec40f9b4adfbe5ecf87d7e30d6bc6e6ef3b Mon Sep 17 00:00:00 2001 From: mav Date: Fri, 9 Mar 2012 07:30:48 +0000 Subject: [PATCH 093/175] Be more polite when setting state->nextevent inside cpu_new_callout(). Hardclock is not the only who wakes idle CPU since kdtrace cyclic addition. MFC after: 2 weeks git-svn-id: http://svn.freebsd.org/base/head@232717 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f (cherry picked from commit defe2ecec6fdb32ab1a3b005c712c268b464381f) Signed-off-by: Xin Li --- sys/kern/kern_clocksource.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_clocksource.c b/sys/kern/kern_clocksource.c index ecfd408..d94157c 100644 --- a/sys/kern/kern_clocksource.c +++ b/sys/kern/kern_clocksource.c @@ -854,10 +854,11 @@ cpu_new_callout(int cpu, int ticks) * If timer is global - there is chance it is already programmed. */ if (periodic || (timer->et_flags & ET_FLAGS_PERCPU) == 0) { - state->nextevent = state->nexthard; tmp = hardperiod; bintime_mul(&tmp, ticks - 1); - bintime_add(&state->nextevent, &tmp); + bintime_add(&tmp, &state->nexthard); + if (bintime_cmp(&tmp, &state->nextevent, <)) + state->nextevent = tmp; if (periodic || bintime_cmp(&state->nextevent, &nexttick, >=)) { ET_HW_UNLOCK(state); -- 1.7.9.4