From ea44fe4922615737402dcec5af1063bc7d5a134c Mon Sep 17 00:00:00 2001 From: john stultz Date: Sat, 21 Jul 2007 04:37:35 -0700 Subject: [PATCH] --- yaml --- r: 62319 b: refs/heads/master c: 3704540b48295253bd9c87a5e7ff545f9d47a3b8 h: refs/heads/master i: 62317: 0f35db76af9d9edcfa35c5e348d11c877138ab17 62315: c269def07dcd5edd42d47ba2fe8ec6ffaa265836 62311: 0cac24629451e395b94c22f6446f54e41bceb7ed 62303: b1e9f3680319a6a9b0e82abc00c49f5908bb5d95 v: v3 --- [refs] | 2 +- trunk/kernel/time/tick-sched.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 23af20e81334..984a7fd48f25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5590a536c0bc403fc73908c66c1c88cbed735ecb +refs/heads/master: 3704540b48295253bd9c87a5e7ff545f9d47a3b8 diff --git a/trunk/kernel/time/tick-sched.c b/trunk/kernel/time/tick-sched.c index 52db9e3c526e..b416995b9757 100644 --- a/trunk/kernel/time/tick-sched.c +++ b/trunk/kernel/time/tick-sched.c @@ -546,6 +546,7 @@ void tick_setup_sched_timer(void) { struct tick_sched *ts = &__get_cpu_var(tick_cpu_sched); ktime_t now = ktime_get(); + u64 offset; /* * Emulate tick processing via per-CPU hrtimers: @@ -554,8 +555,12 @@ void tick_setup_sched_timer(void) ts->sched_timer.function = tick_sched_timer; ts->sched_timer.cb_mode = HRTIMER_CB_IRQSAFE_NO_SOFTIRQ; - /* Get the next period */ + /* Get the next period (per cpu) */ ts->sched_timer.expires = tick_init_jiffy_update(); + offset = ktime_to_ns(tick_period) >> 1; + do_div(offset, NR_CPUS); + offset *= smp_processor_id(); + ts->sched_timer.expires = ktime_add_ns(ts->sched_timer.expires, offset); for (;;) { hrtimer_forward(&ts->sched_timer, now, tick_period);