2020-03-06 11:44:27 +00:00
|
|
|
From 875b7c458428cc65b17950157a9e804383864d31 Mon Sep 17 00:00:00 2001
|
2018-08-27 14:32:32 +00:00
|
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
|
|
|
Date: Sun, 17 Jul 2011 22:51:33 +0200
|
2020-02-21 18:07:43 +00:00
|
|
|
Subject: [PATCH 112/319] sched: Use the proper LOCK_OFFSET for cond_resched()
|
2020-03-06 11:44:27 +00:00
|
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.106-rt44.tar.xz
|
2018-08-27 14:32:32 +00:00
|
|
|
|
|
|
|
|
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>
|
|
|
|
|
---
|
2019-04-08 23:49:20 +00:00
|
|
|
include/linux/preempt.h | 4 ++++
|
2018-08-27 14:32:32 +00:00
|
|
|
1 file changed, 4 insertions(+)
|
|
|
|
|
|
2019-04-08 23:49:20 +00:00
|
|
|
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
|
|
|
|
|
index f7a17fcc3fec..b7fe717eb1f4 100644
|
2018-08-27 14:32:32 +00:00
|
|
|
--- a/include/linux/preempt.h
|
|
|
|
|
+++ b/include/linux/preempt.h
|
|
|
|
|
@@ -118,7 +118,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:
|
2020-01-03 23:36:11 +00:00
|
|
|
--
|
2020-02-21 18:07:43 +00:00
|
|
|
2.25.0
|
2020-01-03 23:36:11 +00:00
|
|
|
|
