From 0b4c803be2bac8933ee621b548a231753ae02c7a Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Tue, 27 Jul 2010 21:02:10 -0700 Subject: [PATCH] --- yaml --- r: 206137 b: refs/heads/master c: af5ab277ded04bd9bc6b048c5a2f0e7d70ef0867 h: refs/heads/master i: 206135: 7010e7c88c76961be4cf9f4c96a0c669365e320e v: v3 --- [refs] | 2 +- trunk/kernel/time/tick-sched.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 520c84d25714..853170861134 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b08de0073a5697cf84d6f448d6dbc6cf02fc6b5 +refs/heads/master: af5ab277ded04bd9bc6b048c5a2f0e7d70ef0867 diff --git a/trunk/kernel/time/tick-sched.c b/trunk/kernel/time/tick-sched.c index 813993b5fb61..74644ccd786c 100644 --- a/trunk/kernel/time/tick-sched.c +++ b/trunk/kernel/time/tick-sched.c @@ -780,7 +780,6 @@ 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: @@ -790,10 +789,6 @@ void tick_setup_sched_timer(void) /* Get the next period (per cpu) */ hrtimer_set_expires(&ts->sched_timer, tick_init_jiffy_update()); - offset = ktime_to_ns(tick_period) >> 1; - do_div(offset, num_possible_cpus()); - offset *= smp_processor_id(); - hrtimer_add_expires_ns(&ts->sched_timer, offset); for (;;) { hrtimer_forward(&ts->sched_timer, now, tick_period);