The patch titled
include/linux/mutex.h: unclear reference to convention
has been removed from the -mm tree. Its filename was
include-linux-mutexh-unclear-reference-to-convention.patch
This patch was dropped because it is redundant
------------------------------------------------------
Subject: include/linux/mutex.h: unclear reference to convention
From: Matti Linnanvuori <mattilinnanvuori@xxxxxxxxx>
Reference to two different conventions is unnecessarily unclear unless you
know them already and requires seeking and reading another file for
understanding.
Signed-off-by: Matti Linnanvuori <mattilinnanvuori@xxxxxxxxx>
Cc: "Randy.Dunlap" <rdunlap@xxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/mutex.h | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff -puN include/linux/mutex.h~include-linux-mutexh-unclear-reference-to-convention include/linux/mutex.h
--- a/include/linux/mutex.h~include-linux-mutexh-unclear-reference-to-convention
+++ a/include/linux/mutex.h
@@ -133,9 +133,19 @@ extern int __must_check mutex_lock_inter
# define mutex_lock_interruptible_nested(lock, subclass) mutex_lock_interruptible(lock)
#endif
-/*
- * NOTE: mutex_trylock() follows the spin_trylock() convention,
- * not the down_trylock() convention!
+/***
+ * mutex_trylock - try acquire the mutex, without waiting
+ * @lock: the mutex to be acquired
+ *
+ * Try to acquire the mutex atomically. Returns 1 if the mutex
+ * has been acquired successfully, and 0 on contention.
+ *
+ * NOTE: this function follows the spin_trylock() convention, so
+ * it is negated to the down_trylock() return values! Be careful
+ * about this when converting semaphore users to mutexes.
+ *
+ * This function must not be used in interrupt context. The
+ * mutex must be released by the same task that acquired it.
*/
extern int fastcall mutex_trylock(struct mutex *lock);
extern void fastcall mutex_unlock(struct mutex *lock);
_
Patches currently in -mm which might be from mattilinnanvuori@xxxxxxxxx are
mutex-documentation-is-unclear-about-software-interrupts-tasklets-and-timers.patch
atomic_opstxt-has-incorrect-misleading-and-insufficient-information.patch
include-linux-mutexh-unclear-reference-to-convention.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
