Messages in this thread Patch in this message | | | Date | Mon, 26 Dec 2005 14:26:26 -0500 (EST) | From | Nicolas Pitre <> | Subject | [patch 3/3] mutex subsystem: inline mutex_is_locked() |
| |
There is currently no advantage to not always inlining mutex_is_locked, even on x86.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Index: linux-2.6/kernel/mutex.c =================================================================== --- linux-2.6.orig/kernel/mutex.c +++ linux-2.6/kernel/mutex.c @@ -22,19 +22,6 @@ # include "mutex.h" #endif -/*** - * mutex_is_locked - is the mutex locked - * @lock: the mutex to be queried - * - * Returns 1 if the mutex is locked, 0 if unlocked. - */ -int fastcall mutex_is_locked(struct mutex *lock) -{ - return atomic_read(&lock->count) != 1; -} - -EXPORT_SYMBOL(mutex_is_locked); - /* * Block on a lock - add ourselves to the list of waiters. * Called with lock->wait_lock held. Index: linux-2.6/include/linux/mutex.h =================================================================== --- linux-2.6.orig/include/linux/mutex.h +++ linux-2.6/include/linux/mutex.h @@ -139,6 +139,9 @@ extern int FASTCALL(mutex_trylock(struct extern void FASTCALL(mutex_unlock(struct mutex *lock)); #endif -extern int FASTCALL(mutex_is_locked(struct mutex *lock)); +static inline int fastcall mutex_is_locked(struct mutex *lock) +{ + return atomic_read(&lock->count) != 1; +} #endif - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |