diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 20:51:33 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:38:13 (GMT) |
| commit | f80aee98490e2f3ded0bf8f534a0d4955b4148c4 (patch) | |
| tree | 46f2e6bd30c80748ba15bd3bf99eda16d2cccf2c /include/linux | |
| parent | 6978b913fd1e835e7e26157d538bdbd5bc8bdad0 (diff) | |
| download | linux-fsl-qoriq-f80aee98490e2f3ded0bf8f534a0d4955b4148c4.tar.xz | |
cond-resched-lock-rt-tweak.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux')
| -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 a99e9e2..bf1cf6d 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2528,7 +2528,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 |