diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 22:51:33 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2011-12-28 16:25:39 -0600 |
| commit | 2ee834ba473738abb3301a920cdd40b307de737d (patch) | |
| tree | 78c9bfc03d8c3abb9ba3493f762aba528a30690b | |
| parent | 54123486c1324195a6516b11f579aa48734d32db (diff) | |
cond-resched-lock-rt-tweak.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -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 2d5e0ecc7c82..34fffb9a39d9 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2595,7 +2595,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 |