diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 22:51:33 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-13 11:01:34 -0500 |
| commit | 9e7ffec9bbdeb02d6449abf757377c80c701cc80 (patch) | |
| tree | 8225d25365a26eb7e928af232f3ade7db034fd56 /include | |
| parent | cb2c3d0163bf8d0f9a4680b75738b81dfc954402 (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 b76e0c80348d..a6b9a6d5b97d 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2689,7 +2689,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 |