diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-14 07:56:44 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-02-13 22:20:32 (GMT) |
| commit | 950b54915b0d530ce5513cedd5d44ddb6ae7441d (patch) | |
| tree | 54ed4965373efa094c858a27623a06903a6870f9 /kernel/sched | |
| parent | 01046732fdd201580f3795edab789a74bd44aa9b (diff) | |
| download | linux-fsl-qoriq-950b54915b0d530ce5513cedd5d44ddb6ae7441d.tar.xz | |
cond-resched-softirq-fix.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/sched')
| -rw-r--r-- | kernel/sched/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 5f1e7c6..29ec887 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. |