aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2010-12-09 15:02:18 -0500
committerJohn Stultz <john.stultz@linaro.org>2010-12-10 14:52:17 -0500
commit1f5a24794a54588ea3a9efd521be31d826e0b9d7 (patch)
tree58dd33af6093cd3a0fed59a12ed41d6c7d8083ba /include/linux
parent87de5ac782761a3ebf806e434e8c9cc205a87274 (diff)
timers: Rename timerlist infrastructure to timerqueue
Thomas pointed out a namespace collision between the new timerlist infrastructure I introduced and the existing timer_list.c So to avoid confusion, I've renamed the timerlist infrastructure to timerqueue. Reported-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/timerlist.h37
-rw-r--r--include/linux/timerqueue.h37
2 files changed, 37 insertions, 37 deletions
diff --git a/include/linux/timerlist.h b/include/linux/timerlist.h
deleted file mode 100644
index c46b28ae6e4d..000000000000
--- a/include/linux/timerlist.h
+++ /dev/null
@@ -1,37 +0,0 @@
1#ifndef _LINUX_TIMERLIST_H
2#define _LINUX_TIMERLIST_H
3
4#include <linux/rbtree.h>
5#include <linux/ktime.h>
6
7
8struct timerlist_node {
9 struct rb_node node;
10 ktime_t expires;
11};
12
13struct timerlist_head {
14 struct rb_root head;
15 struct timerlist_node *next;
16};
17
18
19extern void timerlist_add(struct timerlist_head *head,
20 struct timerlist_node *node);
21extern void timerlist_del(struct timerlist_head *head,
22 struct timerlist_node *node);
23extern struct timerlist_node *timerlist_getnext(struct timerlist_head *head);
24extern struct timerlist_node *timerlist_iterate_next(
25 struct timerlist_node *node);
26
27static inline void timerlist_init(struct timerlist_node *node)
28{
29 RB_CLEAR_NODE(&node->node);
30}
31
32static inline void timerlist_init_head(struct timerlist_head *head)
33{
34 head->head = RB_ROOT;
35 head->next = NULL;
36}
37#endif /* _LINUX_TIMERLIST_H */
diff --git a/include/linux/timerqueue.h b/include/linux/timerqueue.h
new file mode 100644
index 000000000000..406b103894bd
--- /dev/null
+++ b/include/linux/timerqueue.h
@@ -0,0 +1,37 @@
1#ifndef _LINUX_TIMERQUEUE_H
2#define _LINUX_TIMERQUEUE_H
3
4#include <linux/rbtree.h>
5#include <linux/ktime.h>
6
7
8struct timerqueue_node {
9 struct rb_node node;
10 ktime_t expires;
11};
12
13struct timerqueue_head {
14 struct rb_root head;
15 struct timerqueue_node *next;
16};
17
18
19extern void timerqueue_add(struct timerqueue_head *head,
20 struct timerqueue_node *node);
21extern void timerqueue_del(struct timerqueue_head *head,
22 struct timerqueue_node *node);
23extern struct timerqueue_node *timerqueue_getnext(struct timerqueue_head *head);
24extern struct timerqueue_node *timerqueue_iterate_next(
25 struct timerqueue_node *node);
26
27static inline void timerqueue_init(struct timerqueue_node *node)
28{
29 RB_CLEAR_NODE(&node->node);
30}
31
32static inline void timerqueue_init_head(struct timerqueue_head *head)
33{
34 head->head = RB_ROOT;
35 head->next = NULL;
36}
37#endif /* _LINUX_TIMERQUEUE_H */