summaryrefslogtreecommitdiff
path: root/kernel/rtmutex.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-10 23:19:40 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-10 23:19:40 (GMT)
commite7241d771419b8a8671ebc46a043c324ccb0dcf7 (patch)
tree77f1bc9c635e2ac29396816ce9ef9cbdb6853884 /kernel/rtmutex.c
parent3f6280ddf25fa656d0e17960588e52bee48a7547 (diff)
parent04dce7d9d429ea5ea04e9432d1726c930f4d67da (diff)
downloadlinux-3.10-e7241d771419b8a8671ebc46a043c324ccb0dcf7.zip
linux-3.10-e7241d771419b8a8671ebc46a043c324ccb0dcf7.tar.gz
linux-3.10-e7241d771419b8a8671ebc46a043c324ccb0dcf7.tar.bz2
Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: spinlock: Add missing __raw_spin_lock_flags() stub for UP mutex: add atomic_dec_and_mutex_lock(), fix locking, rtmutex.c: Documentation cleanup mutex: add atomic_dec_and_mutex_lock()
Diffstat (limited to 'kernel/rtmutex.c')
-rw-r--r--kernel/rtmutex.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c
index fec77e7..820c5af 100644
--- a/kernel/rtmutex.c
+++ b/kernel/rtmutex.c
@@ -891,9 +891,9 @@ int __sched rt_mutex_lock_interruptible(struct rt_mutex *lock,
EXPORT_SYMBOL_GPL(rt_mutex_lock_interruptible);
/**
- * rt_mutex_lock_interruptible_ktime - lock a rt_mutex interruptible
- * the timeout structure is provided
- * by the caller
+ * rt_mutex_timed_lock - lock a rt_mutex interruptible
+ * the timeout structure is provided
+ * by the caller
*
* @lock: the rt_mutex to be locked
* @timeout: timeout structure or NULL (no timeout)
@@ -940,7 +940,7 @@ void __sched rt_mutex_unlock(struct rt_mutex *lock)
}
EXPORT_SYMBOL_GPL(rt_mutex_unlock);
-/***
+/**
* rt_mutex_destroy - mark a mutex unusable
* @lock: the mutex to be destroyed
*