Commit-ID: 63dc47e956b464e0ed3282f6e70974eebf850180 Gitweb: http://git.kernel.org/tip/63dc47e956b464e0ed3282f6e70974eebf850180 Author: Davidlohr Bueso <d...@stgolabs.net> AuthorDate: Tue, 6 Jan 2015 11:45:04 -0800 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Wed, 14 Jan 2015 15:07:21 +0100
locking/mutex: Checking the stamp is WW only Mark it so by renaming __mutex_lock_check_stamp(). Signed-off-by: Davidlohr Bueso <dbu...@suse.de> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Cc: "Paul E. McKenney" <paul...@linux.vnet.ibm.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Linus Torvalds <torva...@linux-foundation.org> Link: http://lkml.kernel.org/r/1420573509-24774-2-git-send-email-d...@stgolabs.net Signed-off-by: Ingo Molnar <mi...@kernel.org> --- kernel/locking/mutex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c index 4541951..b042ea5 100644 --- a/kernel/locking/mutex.c +++ b/kernel/locking/mutex.c @@ -469,7 +469,7 @@ void __sched ww_mutex_unlock(struct ww_mutex *lock) EXPORT_SYMBOL(ww_mutex_unlock); static inline int __sched -__mutex_lock_check_stamp(struct mutex *lock, struct ww_acquire_ctx *ctx) +__ww_mutex_lock_check_stamp(struct mutex *lock, struct ww_acquire_ctx *ctx) { struct ww_mutex *ww = container_of(lock, struct ww_mutex, base); struct ww_acquire_ctx *hold_ctx = ACCESS_ONCE(ww->ctx); @@ -557,7 +557,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, } if (use_ww_ctx && ww_ctx->acquired > 0) { - ret = __mutex_lock_check_stamp(lock, ww_ctx); + ret = __ww_mutex_lock_check_stamp(lock, ww_ctx); if (ret) goto err; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
