lkml.org 
[lkml]   [2011]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 05/12] hrtimer: fix timerqueue conversion flub
Date
In converting the hrtimers to timerqueue, I missed
a spot in hrtimer_run_queues where we loop running
timers. We end up not pulling the new next value out
and instead just use the last next value, causing
boot time hangs in some cases.

The proper fix is to pull timerqueue_getnext each iteration
instead of using a local next value.

Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
kernel/hrtimer.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index f5aaea2..f2429fc 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1420,11 +1420,8 @@ void hrtimer_run_queues(void)
return;

for (index = 0; index < HRTIMER_MAX_CLOCK_BASES; index++) {
- struct timerqueue_node *next;
-
base = &cpu_base->clock_base[index];
- next = timerqueue_getnext(&base->active);
- if (!next)
+ if (!timerqueue_getnext(&base->active))
continue;

if (gettime) {
@@ -1434,7 +1431,7 @@ void hrtimer_run_queues(void)

raw_spin_lock(&cpu_base->lock);

- while ((node = next)) {
+ while ((node = timerqueue_getnext(&base->active))) {
struct hrtimer *timer;

timer = container_of(node, struct hrtimer, node);
--
1.7.3.2.146.gca209


\
 
 \ /
  Last update: 2011-01-06 03:19    [W:0.135 / U:0.532 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site