23 lines
736 B
Diff
23 lines
736 B
Diff
Subject: cond-resched-lock-rt-tweak.patch
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Sun, 17 Jul 2011 22:51:33 +0200
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
include/linux/sched.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
Index: linux-3.2/include/linux/sched.h
|
|
===================================================================
|
|
--- linux-3.2.orig/include/linux/sched.h
|
|
+++ linux-3.2/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
|