89 lines
2.8 KiB
Diff
89 lines
2.8 KiB
Diff
From f56e061a1c52b1faf6c383275e442969c1b5766e Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Thu, 9 Jun 2011 11:43:52 +0200
|
|
Subject: [PATCH 192/271] rtmutex-lock-killable.patch
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
include/linux/rtmutex.h | 1 +
|
|
kernel/rtmutex.c | 33 +++++++++++++++++++++++++++------
|
|
2 files changed, 28 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h
|
|
index de17134..3561eb2 100644
|
|
--- a/include/linux/rtmutex.h
|
|
+++ b/include/linux/rtmutex.h
|
|
@@ -90,6 +90,7 @@ extern void rt_mutex_destroy(struct rt_mutex *lock);
|
|
extern void rt_mutex_lock(struct rt_mutex *lock);
|
|
extern int rt_mutex_lock_interruptible(struct rt_mutex *lock,
|
|
int detect_deadlock);
|
|
+extern int rt_mutex_lock_killable(struct rt_mutex *lock, int detect_deadlock);
|
|
extern int rt_mutex_timed_lock(struct rt_mutex *lock,
|
|
struct hrtimer_sleeper *timeout,
|
|
int detect_deadlock);
|
|
diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c
|
|
index f9d8482..723fd3a 100644
|
|
--- a/kernel/rtmutex.c
|
|
+++ b/kernel/rtmutex.c
|
|
@@ -799,12 +799,12 @@ EXPORT_SYMBOL_GPL(rt_mutex_lock);
|
|
/**
|
|
* rt_mutex_lock_interruptible - lock a rt_mutex interruptible
|
|
*
|
|
- * @lock: the rt_mutex to be locked
|
|
+ * @lock: the rt_mutex to be locked
|
|
* @detect_deadlock: deadlock detection on/off
|
|
*
|
|
* Returns:
|
|
- * 0 on success
|
|
- * -EINTR when interrupted by a signal
|
|
+ * 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_interruptible(struct rt_mutex *lock,
|
|
@@ -818,17 +818,38 @@ int __sched rt_mutex_lock_interruptible(struct rt_mutex *lock,
|
|
EXPORT_SYMBOL_GPL(rt_mutex_lock_interruptible);
|
|
|
|
/**
|
|
+ * 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,
|
|
+ int detect_deadlock)
|
|
+{
|
|
+ might_sleep();
|
|
+
|
|
+ return rt_mutex_fastlock(lock, TASK_KILLABLE,
|
|
+ detect_deadlock, rt_mutex_slowlock);
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(rt_mutex_lock_killable);
|
|
+
|
|
+/**
|
|
* rt_mutex_timed_lock - lock a rt_mutex interruptible
|
|
* the timeout structure is provided
|
|
* by the caller
|
|
*
|
|
- * @lock: the rt_mutex to be locked
|
|
+ * @lock: the rt_mutex to be locked
|
|
* @timeout: timeout structure or NULL (no timeout)
|
|
* @detect_deadlock: deadlock detection on/off
|
|
*
|
|
* Returns:
|
|
- * 0 on success
|
|
- * -EINTR when interrupted by a signal
|
|
+ * 0 on success
|
|
+ * -EINTR when interrupted by a signal
|
|
* -ETIMEDOUT when the timeout expired
|
|
* -EDEADLK when the lock would deadlock (when deadlock detection is on)
|
|
*/
|
|
--
|
|
1.7.10
|
|
|