aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index 8e503fec1fba..1d35ddadc045 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -760,12 +760,7 @@ __mod_timer(struct timer_list *timer, unsigned long expires,
760 760
761 debug_activate(timer, expires); 761 debug_activate(timer, expires);
762 762
763 cpu = smp_processor_id(); 763 cpu = get_nohz_timer_target(pinned);
764
765#if defined(CONFIG_NO_HZ_COMMON) && defined(CONFIG_SMP)
766 if (!pinned && get_sysctl_timer_migration() && idle_cpu(cpu))
767 cpu = get_nohz_timer_target();
768#endif
769 new_base = per_cpu(tvec_bases, cpu); 764 new_base = per_cpu(tvec_bases, cpu);
770 765
771 if (base != new_base) { 766 if (base != new_base) {