diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-14 09:56:44 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-02-15 10:32:47 -0600 |
| commit | 15dcb26b4371a6324ba780ee8c49da84bce2b224 (patch) | |
| tree | b25b0ece0f494f07511a784f619a6cb21a488b38 /kernel | |
| parent | cc5869844e7f739cc249718e1b32143bea277f6c (diff) | |
cond-resched-softirq-fix.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 42d00037dde6..af3883b73015 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -5826,6 +5826,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()); @@ -5839,6 +5840,7 @@ int __sched __cond_resched_softirq(void) return 0; } EXPORT_SYMBOL(__cond_resched_softirq); +#endif /** * yield - yield the current processor to other threads. |