diff options
Diffstat (limited to 'kernel/timer.c')
-rw-r--r-- | kernel/timer.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 6aa6f7e69ad5..d61d16da0b64 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -692,12 +692,8 @@ __mod_timer(struct timer_list *timer, unsigned long expires, | |||
692 | cpu = smp_processor_id(); | 692 | cpu = smp_processor_id(); |
693 | 693 | ||
694 | #if defined(CONFIG_NO_HZ) && defined(CONFIG_SMP) | 694 | #if defined(CONFIG_NO_HZ) && defined(CONFIG_SMP) |
695 | if (!pinned && get_sysctl_timer_migration() && idle_cpu(cpu)) { | 695 | if (!pinned && get_sysctl_timer_migration() && idle_cpu(cpu)) |
696 | int preferred_cpu = get_nohz_load_balancer(); | 696 | cpu = get_nohz_timer_target(); |
697 | |||
698 | if (preferred_cpu >= 0) | ||
699 | cpu = preferred_cpu; | ||
700 | } | ||
701 | #endif | 697 | #endif |
702 | new_base = per_cpu(tvec_bases, cpu); | 698 | new_base = per_cpu(tvec_bases, cpu); |
703 | 699 | ||