27 lines
796 B
Diff
27 lines
796 B
Diff
From 3ffb526510fd0bf91ab541c1059bd3453890305a Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Sun, 17 Jul 2011 22:51:33 +0200
|
|
Subject: [PATCH 152/278] cond-resched-lock-rt-tweak.patch
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
include/linux/sched.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/include/linux/sched.h b/include/linux/sched.h
|
|
index 96bfec9..7a1df91 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
|
|
--
|
|
1.7.10
|
|
|