aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-07-17 22:51:33 +0200
committerSteven Rostedt <rostedt@rostedt.homelinux.com>2013-05-20 13:46:11 -0400
commitddd39667ac83c71b84ef75152dff4396b76471c4 (patch)
tree86ad19cd1e704d826e78f57b39dd530f8598d259 /include
parent7d90c3b0cc4cf6eca85f5e27040953e691e7b33b (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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 367e219a475a..e946538a5f31 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2611,7 +2611,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