diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-14 09:56:44 +0200 |
---|---|---|
committer | Steven Rostedt <rostedt@rostedt.homelinux.com> | 2013-05-20 13:46:10 -0400 |
commit | 5916b5191ff1800fcc821059d009f1a16e5c68f9 (patch) | |
tree | 3c6b070fedfca619ae8d94c9b8fda61e28ec6ba1 /include | |
parent | d8286f93f493112b5efc2d62ddd547e31920f63c (diff) |
cond-resched-softirq-fix.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-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 5dc840be1a59..72bfb2da1fbf 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2614,12 +2614,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 |