diff options
| author | Watanabe <shunsuke.watanabe@tel.com> | 2012-10-28 11:13:44 +0100 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-06-14 18:37:57 +0400 |
| commit | 3e230eeb87fc9e34667b9e848dee84be442b8420 (patch) | |
| tree | 18dbad0c4ce6028565415517d1c0e3a6554b4d0d | |
| parent | 1f94108d211874ad66fa6fe5ede0637bf9b8fc83 (diff) | |
hrtimer: Raise softirq if hrtimer irq stalled
When the hrtimer stall detection hits the softirq is not raised.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable-rt@vger.kernel.org
| -rw-r--r-- | kernel/hrtimer.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index ec3f91a70c54..aa5eb4fccb3d 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -1535,11 +1535,7 @@ retry: if (expires_next.tv64 == KTIME_MAX || !tick_program_event(expires_next, 0)) { cpu_base->hang_detected = 0; - - if (raise) - raise_softirq_irqoff(HRTIMER_SOFTIRQ); - - return; + goto out; } /* @@ -1583,6 +1579,9 @@ retry: tick_program_event(expires_next, 1); printk_once(KERN_WARNING "hrtimer: interrupt took %llu ns\n", ktime_to_ns(delta)); +out: + if (raise) + raise_softirq_irqoff(HRTIMER_SOFTIRQ); } /* |