From d4b93217bcccfacb4ad0e69c3d0c389aad6d6e02 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 17 Dec 2009 11:15:42 +1100 Subject: [PATCH] --- yaml --- r: 178012 b: refs/heads/master c: cf1e367ee84e02ac349ad0858eb65e8a6a511c8b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/timer.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) 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)