From d8b0f5f304e98d47b9c2af3742074a40298b4dea Mon Sep 17 00:00:00 2001 From: John Stultz Date: Mon, 3 Jan 2011 18:59:43 -0800 Subject: [PATCH] --- yaml --- r: 245632 b: refs/heads/master c: 88d19cf37952a7e1e38b2bf87a00f0e857e63180 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/rbtree.h | 8 ++++++++ trunk/include/linux/timerqueue.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3878d641094d..1d47a04003ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 304529b1b6f8612ccbb4582e997051b48b94f4a4 +refs/heads/master: 88d19cf37952a7e1e38b2bf87a00f0e857e63180 diff --git a/trunk/include/linux/rbtree.h b/trunk/include/linux/rbtree.h index 7066acb2c530..033b507b33b1 100644 --- a/trunk/include/linux/rbtree.h +++ b/trunk/include/linux/rbtree.h @@ -136,6 +136,14 @@ static inline void rb_set_color(struct rb_node *rb, int color) #define RB_EMPTY_NODE(node) (rb_parent(node) == node) #define RB_CLEAR_NODE(node) (rb_set_parent(node, node)) +static inline void rb_init_node(struct rb_node *rb) +{ + rb->rb_parent_color = 0; + rb->rb_right = NULL; + rb->rb_left = NULL; + RB_CLEAR_NODE(rb); +} + extern void rb_insert_color(struct rb_node *, struct rb_root *); extern void rb_erase(struct rb_node *, struct rb_root *); diff --git a/trunk/include/linux/timerqueue.h b/trunk/include/linux/timerqueue.h index a520fd70a59f..5088727478fd 100644 --- a/trunk/include/linux/timerqueue.h +++ b/trunk/include/linux/timerqueue.h @@ -39,7 +39,7 @@ struct timerqueue_node *timerqueue_getnext(struct timerqueue_head *head) static inline void timerqueue_init(struct timerqueue_node *node) { - RB_CLEAR_NODE(&node->node); + rb_init_node(&node->node); } static inline void timerqueue_init_head(struct timerqueue_head *head)