summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-11-13 16:17:09 (GMT)
committerScott Wood <scottwood@freescale.com>2014-04-10 00:20:06 (GMT)
commit01fa1a3cc0c571fa1b2d31ac644841457361cf5f (patch)
treeb06707f31f9eca637ccec2f0e7639c3bd88b32b5 /include/linux
parent5ecad1fddb27507bf1e3bf1935bb7e5b2c8d3c42 (diff)
downloadlinux-fsl-qoriq-01fa1a3cc0c571fa1b2d31ac644841457361cf5f.tar.xz
softirq: Check preemption after reenabling interrupts
raise_softirq_irqoff() disables interrupts and wakes the softirq daemon, but after reenabling interrupts there is no preemption check, so the execution of the softirq thread might be delayed arbitrarily. In principle we could add that check to local_irq_enable/restore, but that's overkill as the rasie_softirq_irqoff() sections are the only ones which show this behaviour. Reported-by: Carsten Emde <cbe@osadl.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: stable-rt@vger.kernel.org
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/preempt.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index 116ac32..7d08aab 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -72,8 +72,10 @@ do { \
#ifndef CONFIG_PREEMPT_RT_BASE
# define preempt_enable_no_resched() sched_preempt_enable_no_resched()
+# define preempt_check_resched_rt() barrier()
#else
# define preempt_enable_no_resched() preempt_enable()
+# define preempt_check_resched_rt() preempt_check_resched()
#endif
#define preempt_enable() \
@@ -127,6 +129,7 @@ do { \
#define preempt_disable_notrace() barrier()
#define preempt_enable_no_resched_notrace() barrier()
#define preempt_enable_notrace() barrier()
+#define preempt_check_resched_rt() barrier()
#endif /* CONFIG_PREEMPT_COUNT */