timer: Remove code redundancy while calling get_nohz_timer_target()

[deliverable/linux.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index 8e503fec1fbaa59b1ec4e7ed413cafb58dfe9f58..1d35ddadc045753a2b13bc9017eaef38abc89383 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -760,12 +760,7 @@ __mod_timer(struct timer_list *timer, unsigned long expires,
 
        debug_activate(timer, expires);
 
-       cpu = smp_processor_id();
-
-#if defined(CONFIG_NO_HZ_COMMON) && defined(CONFIG_SMP)
-       if (!pinned && get_sysctl_timer_migration() && idle_cpu(cpu))
-               cpu = get_nohz_timer_target();
-#endif
+       cpu = get_nohz_timer_target(pinned);
        new_base = per_cpu(tvec_bases, cpu);
 
        if (base != new_base) {