39 lines
1.0 KiB
Diff
39 lines
1.0 KiB
Diff
Subject: hrtimer: Raise softirq if hrtimer irq stalled
|
|
From: Watanabe <shunsuke.watanabe@tel.com>
|
|
Date: Sun, 28 Oct 2012 11:13:44 +0100
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/3.14/patches-3.14.10-rt7.tar.xz
|
|
|
|
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
|
|
@@ -1560,11 +1560,7 @@ void hrtimer_interrupt(struct clock_even
|
|
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;
|
|
}
|
|
|
|
/*
|
|
@@ -1608,6 +1604,9 @@ void hrtimer_interrupt(struct clock_even
|
|
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);
|
|
}
|
|
|
|
/*
|