| Subject: cond-resched-softirq-fix.patch |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Thu, 14 Jul 2011 09:56:44 +0200 |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| --- |
| include/linux/sched.h | 4 ++++ |
| kernel/sched/core.c | 2 ++ |
| 2 files changed, 6 insertions(+) |
| |
| --- a/include/linux/sched.h |
| +++ b/include/linux/sched.h |
| @@ -2497,12 +2497,16 @@ extern int __cond_resched_lock(spinlock_ |
| __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 |
| |
| /* |
| * Does a critical section need to be broken due to another |
| --- a/kernel/sched/core.c |
| +++ b/kernel/sched/core.c |
| @@ -4485,6 +4485,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()); |
| @@ -4498,6 +4499,7 @@ int __sched __cond_resched_softirq(void) |
| return 0; |
| } |
| EXPORT_SYMBOL(__cond_resched_softirq); |
| +#endif |
| |
| /** |
| * yield - yield the current processor to other threads. |
