diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-14 09:56:44 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@rostedt.homelinux.com> | 2013-12-06 20:55:13 -0500 |
| commit | 0f51f023a7ac4991b8c9cf2f79a8e9c0490a19e9 (patch) | |
| tree | 74ab6be1d519a35e1ba3595aad4a2acfe4e88118 /include | |
| parent | caf16bce467cb47fb83325eb6440e1589f19ef33 (diff) | |
| download | linux-rt-0f51f023a7ac4991b8c9cf2f79a8e9c0490a19e9.tar.gz | |
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 62669bfbbe3e..6c277fdae5e8 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2705,12 +2705,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 |