summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-07-17 20:51:33 (GMT)
committerScott Wood <scottwood@freescale.com>2015-02-13 22:20:33 (GMT)
commitb0fe57815be12ef0c972cdfe87b4c5b89d4d2809 (patch)
tree68c8180eb9e971e4b07985b88b23ff382e85d671 /include
parent950b54915b0d530ce5513cedd5d44ddb6ae7441d (diff)
downloadlinux-fsl-qoriq-b0fe57815be12ef0c972cdfe87b4c5b89d4d2809.tar.xz
cond-resched-lock-rt-tweak.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/linux/sched.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index df281c5..a32ddf5 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2567,7 +2567,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