diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-14 09:56:44 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-13 11:01:34 -0500 |
| commit | cb2c3d0163bf8d0f9a4680b75738b81dfc954402 (patch) | |
| tree | 5d41579bae3ee5909d8100c2a7aa1c384d3edbc2 /include/linux | |
| parent | 83fafb04e2fd648a8e65a3defcc5cae2a878e1cf (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 d177da5ebcf6..b76e0c80348d 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2700,12 +2700,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 |