| Subject: hrtimer: Raise softirq if hrtimer irq stalled |
| From: Watanabe <shunsuke.watanabe@tel.com> |
| Date: Sun, 28 Oct 2012 11:13:44 +0100 |
| |
| 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 |
| --- |
| kernel/hrtimer.c | 9 ++++----- |
| 1 file changed, 4 insertions(+), 5 deletions(-) |
| |
| --- 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); |
| } |
| |
| /* |
