Commit-ID: b007c389d3e09b823eccda1503390fa2a9adca0d
Gitweb: http://git.kernel.org/tip/b007c389d3e09b823eccda1503390fa2a9adca0d
Author: John Stultz <john.stultz@xxxxxxxxxx>
AuthorDate: Fri, 10 Dec 2010 22:19:53 -0800
Committer: John Stultz <john.stultz@xxxxxxxxxx>
CommitDate: Fri, 10 Dec 2010 22:19:53 -0800
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@xxxxxxx>
Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
---
kernel/hrtimer.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 93976ad..7a7a206 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -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);
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|