diff options
| author | Watanabe <shunsuke.watanabe@tel.com> | 2012-10-28 11:13:44 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-04-30 23:02:06 -0400 |
| commit | c5c93b2dc1983a6ef02d337e470b43c581ad5d32 (patch) | |
| tree | f30c53bd4a05879e254d5b50f9272ff1a80958a9 | |
| parent | 43373f80316a01fb2d4f62de0a0b43b01539dd5e (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 0c95972b2159..1e3f06c3f41b 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -1526,11 +1526,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; } /* @@ -1574,6 +1570,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); } /* |