aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index 4e3040b40d16..1b7489fdea41 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -738,7 +738,7 @@ __mod_timer(struct timer_list *timer, unsigned long expires,
738 738
739 cpu = smp_processor_id(); 739 cpu = smp_processor_id();
740 740
741#if defined(CONFIG_NO_HZ) && defined(CONFIG_SMP) 741#if defined(CONFIG_NO_HZ_COMMON) && defined(CONFIG_SMP)
742 if (!pinned && get_sysctl_timer_migration() && idle_cpu(cpu)) 742 if (!pinned && get_sysctl_timer_migration() && idle_cpu(cpu))
743 cpu = get_nohz_timer_target(); 743 cpu = get_nohz_timer_target();
744#endif 744#endif
@@ -1188,7 +1188,7 @@ static inline void __run_timers(struct tvec_base *base)
1188 spin_unlock_irq(&base->lock); 1188 spin_unlock_irq(&base->lock);
1189} 1189}
1190 1190
1191#ifdef CONFIG_NO_HZ 1191#ifdef CONFIG_NO_HZ_COMMON
1192/* 1192/*
1193 * Find out when the next timer event is due to happen. This 1193 * Find out when the next timer event is due to happen. This
1194 * is used on S/390 to stop all activity when a CPU is idle. 1194 * is used on S/390 to stop all activity when a CPU is idle.