Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63dc47e9 authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Ingo Molnar
Browse files

locking/mutex: Checking the stamp is WW only 



Mark it so by renaming __mutex_lock_check_stamp().

Signed-off-by: default avatarDavidlohr Bueso <dbueso@suse.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/1420573509-24774-2-git-send-email-dave@stgolabs.net


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 188c9019

kernel/locking/mutex.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

		}