diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-14 07:56:44 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:38:12 (GMT) |
| commit | 6978b913fd1e835e7e26157d538bdbd5bc8bdad0 (patch) | |
| tree | 92d504e94291a3a77d0f5aa2acdb47caecaac424 | |
| parent | f15a3389156d2edf1fc8427ef6cef53212b15e9e (diff) | |
| download | linux-fsl-qoriq-6978b913fd1e835e7e26157d538bdbd5bc8bdad0.tar.xz | |
cond-resched-softirq-fix.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | include/linux/sched.h | 4 | ||||
| -rw-r--r-- | kernel/sched/core.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 51e84f0..a99e9e2 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2539,12 +2539,16 @@ extern int __cond_resched_lock(spinlock_t *lock); __cond_resched_lock(lock); \ }) +#ifndef CONFIG_PREEMPT_RT_FULL extern int __cond_resched_softirq(void); #define cond_resched_softirq() ({ \ __might_sleep(__FILE__, __LINE__, SOFTIRQ_DISABLE_OFFSET); \ __cond_resched_softirq(); \ }) +#else +# define cond_resched_softirq() cond_resched() +#endif static inline void cond_resched_rcu(void) { diff --git a/kernel/sched/core.c b/kernel/sched/core.c index d9e3b58..3ec1cdc 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3954,6 +3954,7 @@ int __cond_resched_lock(spinlock_t *lock) } EXPORT_SYMBOL(__cond_resched_lock); +#ifndef CONFIG_PREEMPT_RT_FULL int __sched __cond_resched_softirq(void) { BUG_ON(!in_softirq()); @@ -3967,6 +3968,7 @@ int __sched __cond_resched_softirq(void) return 0; } EXPORT_SYMBOL(__cond_resched_softirq); +#endif /** * yield - yield the current processor to other threads. |