linux/debian/patches-rt/0136-rtmutex-Add-rtmutex_lo...

61 lines
2.0 KiB
Diff
Raw Normal View History

2020-03-06 11:44:27 +00:00
From 8d29fec3b1d6060351dadfed4d8e4555ee42ada2 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
2019-04-08 23:49:20 +00:00
Date: Thu, 9 Jun 2011 11:43:52 +0200
2020-03-28 12:59:50 +00:00
Subject: [PATCH 136/326] rtmutex: Add rtmutex_lock_killable()
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.106-rt45.tar.xz
Add "killable" type to rtmutex. We need this since rtmutex are used as
"normal" mutexes which do use this type.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
2019-04-08 23:49:20 +00:00
include/linux/rtmutex.h | 1 +
kernel/locking/rtmutex.c | 19 +++++++++++++++++++
2 files changed, 20 insertions(+)
2019-04-08 23:49:20 +00:00
diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h
index 6fd615a0eea9..81ece6a8291a 100644
--- a/include/linux/rtmutex.h
+++ b/include/linux/rtmutex.h
2019-04-08 23:49:20 +00:00
@@ -115,6 +115,7 @@ extern void rt_mutex_lock(struct rt_mutex *lock);
#endif
extern int rt_mutex_lock_interruptible(struct rt_mutex *lock);
+extern int rt_mutex_lock_killable(struct rt_mutex *lock);
extern int rt_mutex_timed_lock(struct rt_mutex *lock,
struct hrtimer_sleeper *timeout);
2019-04-08 23:49:20 +00:00
diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
index 1c3f56d3d9b6..a4b2af7718f8 100644
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
2019-04-08 23:49:20 +00:00
@@ -1562,6 +1562,25 @@ int __sched __rt_mutex_futex_trylock(struct rt_mutex *lock)
return __rt_mutex_slowtrylock(lock);
}
2019-04-08 23:49:20 +00:00
+/**
+ * rt_mutex_lock_killable - lock a rt_mutex killable
+ *
+ * @lock: the rt_mutex to be locked
+ * @detect_deadlock: deadlock detection on/off
+ *
+ * Returns:
+ * 0 on success
+ * -EINTR when interrupted by a signal
+ * -EDEADLK when the lock would deadlock (when deadlock detection is on)
+ */
+int __sched rt_mutex_lock_killable(struct rt_mutex *lock)
+{
+ might_sleep();
+
+ return rt_mutex_fastlock(lock, TASK_KILLABLE, rt_mutex_slowlock);
+}
+EXPORT_SYMBOL_GPL(rt_mutex_lock_killable);
+
2019-04-08 23:49:20 +00:00
/**
* rt_mutex_timed_lock - lock a rt_mutex interruptible
* the timeout structure is provided
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