diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-04-22 03:38:50 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-22 03:38:50 +0200 |
| commit | ed198cb49750fd9ec564e9f1df66c10efea605f1 (patch) | |
| tree | 04b508f5455c6c49e8af89913974108b3e1a83b0 /kernel/hrtimer.c | |
| parent | [RBTREE] Add explicit alignment to sizeof(long) for struct rb_node. (diff) | |
| download | linux-ed198cb49750fd9ec564e9f1df66c10efea605f1.tar.xz linux-ed198cb49750fd9ec564e9f1df66c10efea605f1.zip | |
[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 'kernel/hrtimer.c')
| -rw-r--r-- | kernel/hrtimer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index d2a7296c8251..04ab27ddfd90 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); } /** |