diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-04-21 21:38:50 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-21 21:38:50 -0400 |
commit | ed198cb49750fd9ec564e9f1df66c10efea605f1 (patch) | |
tree | 04b508f5455c6c49e8af89913974108b3e1a83b0 /include/linux | |
parent | e977145aeaad23d443686f2a2d5b32800d1607c5 (diff) |
[RBTREE] Update hrtimers to use rb_parent() accessor macro.
Also switch it to use the same method of using off-tree nodes as
everyone else now does -- set them to point to themselves.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/hrtimer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 306acf1dc6d5..7d2a1b974c5e 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h | |||
@@ -127,7 +127,7 @@ extern ktime_t hrtimer_get_next_event(void); | |||
127 | 127 | ||
128 | static inline int hrtimer_active(const struct hrtimer *timer) | 128 | static inline int hrtimer_active(const struct hrtimer *timer) |
129 | { | 129 | { |
130 | return timer->node.rb_parent != HRTIMER_INACTIVE; | 130 | return rb_parent(&timer->node) != &timer->node; |
131 | } | 131 | } |
132 | 132 | ||
133 | /* Forward a hrtimer so it expires after now: */ | 133 | /* Forward a hrtimer so it expires after now: */ |