diff options
| author | James Morris <james.l.morris@oracle.com> | 2013-01-07 12:06:43 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2013-01-07 12:06:43 +1100 |
| commit | cf9ce948f47640797bd19980e1d99c6d17d0bdc3 (patch) | |
| tree | 97ce168cf32ac88b9aa93408b0b681747416a504 /include/linux/timerqueue.h | |
| parent | e93072374112db9dc86635934ee761249be28370 (diff) | |
| parent | d1c3ed669a2d452cacfb48c2d171a1f364dae2ed (diff) | |
Merge tag 'v3.8-rc2' into next
Sync to Linus' tree.
Linux 3.8-rc2
Diffstat (limited to 'include/linux/timerqueue.h')
| -rw-r--r-- | include/linux/timerqueue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/timerqueue.h b/include/linux/timerqueue.h index 5088727478fd..a520fd70a59f 100644 --- 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) |