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

hrtimer: fix timerqueue conversion flub 

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>
This commit is contained in:
John Stultz 2010-12-10 22:19:53 -08:00
parent 998adc3dda
commit b007c389d3
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/hrtimer.c
View File

@ -1412,11 +1412,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) {
@ -1426,7 +1423,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);