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/timerqueue.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/timerqueue.h')
| -rw-r--r-- | include/linux/timerqueue.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/timerqueue.h b/include/linux/timerqueue.h index a520fd70a59f..7eec17ad7fa1 100644 --- a/include/linux/timerqueue.h +++ b/include/linux/timerqueue.h @@ -16,10 +16,10 @@ struct timerqueue_head { }; -extern void timerqueue_add(struct timerqueue_head *head, - struct timerqueue_node *node); -extern void timerqueue_del(struct timerqueue_head *head, - struct timerqueue_node *node); +extern bool timerqueue_add(struct timerqueue_head *head, + struct timerqueue_node *node); +extern bool timerqueue_del(struct timerqueue_head *head, + struct timerqueue_node *node); extern struct timerqueue_node *timerqueue_iterate_next( struct timerqueue_node *node); |