Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for...

[sfrench/cifs-2.6.git] / include / linux / timerqueue.h

diff --git a/include/linux/timerqueue.h b/include/linux/timerqueue.h
index 5088727478fd8ad91bc7e17f9b85252b8ef8e4a2..a520fd70a59f371f40a34f79e883dcf7b32c23f7 100644 (file)
--- a/include/linux/timerqueue.h
+++ b/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_init_node(&node->node);
+       RB_CLEAR_NODE(&node->node);
 }
 
 static inline void timerqueue_init_head(struct timerqueue_head *head)