X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=kernel%2Ftimer.c;h=03bc7f1f159350d2ad29ca45d3b3a28fc275f296;hb=3cf430b0636045dc524759a0852293ba037732a7;hp=b4da888497fa4ffecc0957ea4f028b8aa8ea8666;hpb=ace7f1b79670aa0c1d9f4b0442be82e565827333;p=~andy%2Flinux

diff --git a/kernel/timer.c b/kernel/timer.c
index b4da888497f..03bc7f1f159 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -812,7 +812,7 @@ static inline void __run_timers(struct tvec_base *base)
 	spin_unlock_irq(&base->lock);
 }
 
-#if defined(CONFIG_NO_IDLE_HZ) || defined(CONFIG_NO_HZ)
+#ifdef CONFIG_NO_HZ
 /*
  * Find out when the next timer event is due to happen. This
  * 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)
 
 	return cmp_next_hrtimer_event(now, expires);
 }
-
-#ifdef CONFIG_NO_IDLE_HZ
-unsigned long next_timer_interrupt(void)
-{
-	return get_next_timer_interrupt(jiffies);
-}
-#endif
-
 #endif
 
 #ifndef CONFIG_VIRT_CPU_ACCOUNTING