diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 09:36:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 09:36:40 -0700 |
| commit | 513694b5f931a62561d21eb97a4740ce37464a45 (patch) | |
| tree | f340654b3d628c1b443751b1ba6a50f2b97bd4d6 /kernel | |
| parent | kernel-doc: detect trailing kernel-doc line trash (diff) | |
| parent | hrtimer: timeout too long when using HRTIMER_CB_SOFTIRQ (diff) | |
| download | linux-dev-513694b5f931a62561d21eb97a4740ce37464a45.tar.xz linux-dev-513694b5f931a62561d21eb97a4740ce37464a45.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
hrtimer: timeout too long when using HRTIMER_CB_SOFTIRQ
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/hrtimer.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index f78777abe769..e379ef0e9c20 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -1080,8 +1080,19 @@ static void run_hrtimer_pending(struct hrtimer_cpu_base *cpu_base) * If the timer was rearmed on another CPU, reprogram * the event device. */ - if (timer->base->first == &timer->node) - hrtimer_reprogram(timer, timer->base); + struct hrtimer_clock_base *base = timer->base; + + if (base->first == &timer->node && + hrtimer_reprogram(timer, base)) { + /* + * Timer is expired. Thus move it from tree to + * pending list again. + */ + __remove_hrtimer(timer, base, + HRTIMER_STATE_PENDING, 0); + list_add_tail(&timer->cb_entry, + &base->cpu_base->cb_pending); + } } } spin_unlock_irq(&cpu_base->lock); |