diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 22:51:33 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-02-15 10:32:48 -0600 |
| commit | e9954a4e0e655ce6cb7d07a86e7cd76ac114fc2a (patch) | |
| tree | 323003920e475282bfeebaf66295d2d59d537e26 /include | |
| parent | c2f14e0ea5a3c2d4a53897a7e20a6e5d9406b764 (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 |