diff options
| author | Watanabe <shunsuke.watanabe@tel.com> | 2012-10-28 10:13:44 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-04-04 22:09:39 (GMT) |
| commit | f8a08e11d20024a5c1931f28e959efb076086195 (patch) | |
| tree | 2f9dd529e73120abf103cae88c1f9583be33f025 /kernel | |
| parent | bfb05712af4376b1189d5bbdccd8e39112a420d4 (diff) | |
| download | linux-fsl-qoriq-f8a08e11d20024a5c1931f28e959efb076086195.tar.xz | |
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
Diffstat (limited to 'kernel')
| -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 a8b8527..b8ba4e3 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -1528,11 +1528,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; } /* @@ -1576,6 +1572,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); } /* |