diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 22:51:33 +0200 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-03-01 09:28:43 -0600 |
commit | 767de6e26ba6677eb0af018c9d801b0c4c1f1296 (patch) | |
tree | 35e2141460716f21b10826bc498b537348420038 /include | |
parent | 9ca953e1da0325bbb0b53b27c509d776188eb2f0 (diff) |
cond-resched-lock-rt-tweak.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/sched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 99e7f8bca335..175aaeec5b27 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2599,7 +2599,7 @@ extern int _cond_resched(void); extern int __cond_resched_lock(spinlock_t *lock); -#ifdef CONFIG_PREEMPT_COUNT +#if defined(CONFIG_PREEMPT_COUNT) && !defined(CONFIG_PREEMPT_RT_FULL) #define PREEMPT_LOCK_OFFSET PREEMPT_OFFSET #else #define PREEMPT_LOCK_OFFSET 0 |