diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-14 09:56:44 +0200 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2012-07-17 21:15:24 -0400 |
commit | 95d9cd364bcd1fab250fc6e6932263ca0c16abe9 (patch) | |
tree | d61e5693c96e85f9763d79eeebbec91aa577e53c /include | |
parent | c119b91ea0c7ed5bc8e5d69156bef47b11d5d007 (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 6c203498a4e1..38d78dc5b455 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2602,12 +2602,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 |