diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-14 09:56:44 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-03-07 16:15:01 -0600 |
| commit | 1fcc4de6118e7142b6ada0346289d311e71ef392 (patch) | |
| tree | 2f1769e8bffe1d81bd8e4296d80ca7db01493316 /include | |
| parent | 8a14e0c317401c2162e5fddea4772a95024c2861 (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 |