diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-14 09:56:44 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2011-12-28 16:25:38 -0600 |
| commit | e10e6bfbc3b8827c4c0aef38e7cb979b8a23fd1f (patch) | |
| tree | 1183d86633c8e46c0d05bf9875a9aafccd2c05ec /include/linux | |
| parent | 15afe758a1cdfbc870dabe10d4ccf06263446e2e (diff) | |
cond-resched-softirq-fix.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sched.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index cd7e92a75670..6adc0244802f 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2598,12 +2598,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 /* * Does a critical section need to be broken due to another |