diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-04-22 02:38:50 +0100 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-22 02:38:50 +0100 |
commit | ed198cb49750fd9ec564e9f1df66c10efea605f1 (patch) | |
tree | 04b508f5455c6c49e8af89913974108b3e1a83b0 | |
parent | e977145aeaad23d443686f2a2d5b32800d1607c5 (diff) | |
download | op-kernel-dev-ed198cb49750fd9ec564e9f1df66c10efea605f1.zip op-kernel-dev-ed198cb49750fd9ec564e9f1df66c10efea605f1.tar.gz |
[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>
-rw-r--r-- | include/linux/hrtimer.h | 2 | ||||
-rw-r--r-- | kernel/hrtimer.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 306acf1..7d2a1b9 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -127,7 +127,7 @@ extern ktime_t hrtimer_get_next_event(void); static inline int hrtimer_active(const struct hrtimer *timer) { - return timer->node.rb_parent != HRTIMER_INACTIVE; + return rb_parent(&timer->node) != &timer->node; } /* Forward a hrtimer so it expires after now: */ diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index d2a7296..04ab27d 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -393,7 +393,7 @@ static void __remove_hrtimer(struct hrtimer *timer, struct hrtimer_base *base) if (base->first == &timer->node) base->first = rb_next(&timer->node); rb_erase(&timer->node, &base->active); - timer->node.rb_parent = HRTIMER_INACTIVE; + rb_set_parent(&timer->node, &timer->node); } /* @@ -578,7 +578,7 @@ void hrtimer_init(struct hrtimer *timer, clockid_t clock_id, clock_id = CLOCK_MONOTONIC; timer->base = &bases[clock_id]; - timer->node.rb_parent = HRTIMER_INACTIVE; + rb_set_parent(&timer->node, &timer->node); } /** |