| Subject: rtmutex: Add rtmutex_lock_killable() |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Thu, 09 Jun 2011 11:43:52 +0200 |
| |
| 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> |
| --- |
| include/linux/rtmutex.h | 1 + |
| kernel/locking/rtmutex.c | 19 +++++++++++++++++++ |
| 2 files changed, 20 insertions(+) |
| |
| --- a/include/linux/rtmutex.h |
| +++ b/include/linux/rtmutex.h |
| @@ -91,6 +91,7 @@ extern void rt_mutex_destroy(struct rt_m |
| |
| extern void rt_mutex_lock(struct rt_mutex *lock); |
| 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); |
| |
| --- a/kernel/locking/rtmutex.c |
| +++ b/kernel/locking/rtmutex.c |
| @@ -1537,6 +1537,25 @@ int __sched rt_mutex_futex_trylock(struc |
| } |
| |
| /** |
| + * 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); |
| + |
| +/** |
| * rt_mutex_timed_lock - lock a rt_mutex interruptible |
| * the timeout structure is provided |
| * by the caller |