Jetpack/kernel/kernel-4.9/rt-patches/0138-sched-Use-the-proper-L...

33 lines
906 B
Diff
Raw Normal View History

From 00a2f3b9dad4a3844cb8ebe521bfb49d14ab3a7f Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sun, 17 Jul 2011 22:51:33 +0200
Subject: [PATCH 138/352] sched: Use the proper LOCK_OFFSET for cond_resched()
RT does not increment preempt count when a 'sleeping' spinlock is
locked. Update PREEMPT_LOCK_OFFSET for that case.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
include/linux/preempt.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index 64f1488..f17045b 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -96,7 +96,11 @@
/*
* The preempt_count offset after spin_lock()
*/
+#if !defined(CONFIG_PREEMPT_RT_FULL)
#define PREEMPT_LOCK_OFFSET PREEMPT_DISABLE_OFFSET
+#else
+#define PREEMPT_LOCK_OFFSET 0
+#endif
/*
* The preempt_count offset needed for things like:
--
2.7.4