diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 14:17:48 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 14:17:48 +0100 |
| commit | 15e7f8b92aed71819411025279cd3df37f8c636b (patch) | |
| tree | 6bc90fd9fcdd4e58321e3f881b2fbcb108a6a654 /kernel/timer.c | |
| parent | 21949f00a022e090a7e8bc9a01dfca88273c6146 (diff) | |
| parent | ef18beded8ddbaafdf4914bab209f77e60ae3a18 (diff) | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 5db5a8d26811..15533b792397 100644 --- a/kernel/timer.c +++ b/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) |