summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-07-17 22:51:33 +0200
committerClark Williams <williams@redhat.com>2012-04-10 16:37:06 -0500
commitd25cc9cdd37d01a6ee3779d12fb23b00b8ff0bc8 (patch)
treea3f3861011febfb6c0dd26fa39c460daeba947eb /include
parenta35b6f07d03ce821543c2fdfd744d6ad3683741b (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 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