dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[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>
This commit is contained in:
David Woodhouse 2006-04-22 02:38:50 +01:00
parent e977145aea
commit ed198cb497
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/hrtimer.h
View File

@ -127,7 +127,7 @@ extern ktime_t hrtimer_get_next_event(void);
static inline int hrtimer_active(const struct hrtimer *timer) 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: */ /* Forward a hrtimer so it expires after now: */

4
kernel/hrtimer.c
View File

@ -393,7 +393,7 @@ static void __remove_hrtimer(struct hrtimer *timer, struct hrtimer_base *base)
if (base->first == &timer->node) if (base->first == &timer->node)
base->first = rb_next(&timer->node); base->first = rb_next(&timer->node);
rb_erase(&timer->node, &base->active); 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; clock_id = CLOCK_MONOTONIC;
timer->base = &bases[clock_id]; timer->base = &bases[clock_id];
timer->node.rb_parent = HRTIMER_INACTIVE; rb_set_parent(&timer->node, &timer->node);
} }
/** /**