diff options
Diffstat (limited to 'kernel')
-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 01fa2ae98a85..18324305724a 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -393,7 +393,7 @@ static void __remove_hrtimer(struct hrtimer *timer, struct hrtimer_base *base) | |||
393 | if (base->first == &timer->node) | 393 | if (base->first == &timer->node) |
394 | base->first = rb_next(&timer->node); | 394 | base->first = rb_next(&timer->node); |
395 | rb_erase(&timer->node, &base->active); | 395 | rb_erase(&timer->node, &base->active); |
396 | timer->node.rb_parent = HRTIMER_INACTIVE; | 396 | rb_set_parent(&timer->node, &timer->node); |
397 | } | 397 | } |
398 | 398 | ||
399 | /* | 399 | /* |
@@ -582,7 +582,7 @@ void hrtimer_init(struct hrtimer *timer, clockid_t clock_id, | |||
582 | clock_id = CLOCK_MONOTONIC; | 582 | clock_id = CLOCK_MONOTONIC; |
583 | 583 | ||
584 | timer->base = &bases[clock_id]; | 584 | timer->base = &bases[clock_id]; |
585 | timer->node.rb_parent = HRTIMER_INACTIVE; | 585 | rb_set_parent(&timer->node, &timer->node); |
586 | } | 586 | } |
587 | EXPORT_SYMBOL_GPL(hrtimer_init); | 587 | EXPORT_SYMBOL_GPL(hrtimer_init); |
588 | 588 | ||