diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-06-19 00:17:47 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-06-19 00:17:47 +0200 |
| commit | 624bbdfac99c50bf03dff9a0023f666b8e965627 (patch) | |
| tree | 431d1345087021736a2ae66b041d2a9593ebf1d3 /include/linux/timer.h | |
| parent | 6f9aad0bc37286c0441b57f0ba8cffee50715426 (diff) | |
| parent | 887d9dc989eb0154492e41e7c07492edbb088ba1 (diff) | |
Merge branch 'timers/core' into sched/hrtimers
Merge sched/core and timers/core so we can apply the sched balancing
patch queue, which depends on both.
Diffstat (limited to 'include/linux/timer.h')
| -rw-r--r-- | include/linux/timer.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index 8c5a197e1587..fbb80e0030bf 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -188,13 +188,6 @@ extern void set_timer_slack(struct timer_list *time, int slack_hz); #define NEXT_TIMER_MAX_DELTA ((1UL << 30) - 1) /* - * Return when the next timer-wheel timeout occurs (in absolute jiffies), - * locks the timer base and does the comparison against the given - * jiffie. - */ -extern unsigned long get_next_timer_interrupt(unsigned long now); - -/* * Timer-statistics info: */ #ifdef CONFIG_TIMER_STATS |