diff options
Diffstat (limited to 'kernel/timer.c')
-rw-r--r-- | kernel/timer.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index b4da888497fa..03bc7f1f1593 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -812,7 +812,7 @@ static inline void __run_timers(struct tvec_base *base) | |||
812 | spin_unlock_irq(&base->lock); | 812 | spin_unlock_irq(&base->lock); |
813 | } | 813 | } |
814 | 814 | ||
815 | #if defined(CONFIG_NO_IDLE_HZ) || defined(CONFIG_NO_HZ) | 815 | #ifdef CONFIG_NO_HZ |
816 | /* | 816 | /* |
817 | * Find out when the next timer event is due to happen. This | 817 | * Find out when the next timer event is due to happen. This |
818 | * is used on S/390 to stop all activity when a cpus is idle. | 818 | * is used on S/390 to stop all activity when a cpus is idle. |
@@ -947,14 +947,6 @@ unsigned long get_next_timer_interrupt(unsigned long now) | |||
947 | 947 | ||
948 | return cmp_next_hrtimer_event(now, expires); | 948 | return cmp_next_hrtimer_event(now, expires); |
949 | } | 949 | } |
950 | |||
951 | #ifdef CONFIG_NO_IDLE_HZ | ||
952 | unsigned long next_timer_interrupt(void) | ||
953 | { | ||
954 | return get_next_timer_interrupt(jiffies); | ||
955 | } | ||
956 | #endif | ||
957 | |||
958 | #endif | 950 | #endif |
959 | 951 | ||
960 | #ifndef CONFIG_VIRT_CPU_ACCOUNTING | 952 | #ifndef CONFIG_VIRT_CPU_ACCOUNTING |