diff --git a/[refs] b/[refs] index 8f55d37e1152..7f4f88b56716 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb6eddf7676e1c1f3e637aa93c5224488d99036f +refs/heads/master: cf1e367ee84e02ac349ad0858eb65e8a6a511c8b diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c index 5db5a8d26811..15533b792397 100644 --- a/trunk/kernel/timer.c +++ b/trunk/kernel/timer.c @@ -656,8 +656,6 @@ __mod_timer(struct timer_list *timer, unsigned long expires, debug_activate(timer, expires); - new_base = __get_cpu_var(tvec_bases); - cpu = smp_processor_id(); #if defined(CONFIG_NO_HZ) && defined(CONFIG_SMP)