diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 +0200 |
| commit | cdbfc557c43ea1f1f9b7062300ecb1254969814b (patch) | |
| tree | 255f1cf62cea2c3dec208799a00a116e714a6128 /kernel/timer.c | |
| parent | 4d8cc874d7ed43eda72765e9c0e141e170fee4f3 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index ceacc662657..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 @@ -1502,7 +1494,7 @@ void __init init_timers(void) BUG_ON(err == NOTIFY_BAD); register_cpu_notifier(&timers_nb); - open_softirq(TIMER_SOFTIRQ, run_timer_softirq, NULL); + open_softirq(TIMER_SOFTIRQ, run_timer_softirq); } /** |