Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

locking/mutex: Checking the stamp is WW only

Mark it so by renaming __mutex_lock_check_stamp().

Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Signed-off-by: Peter 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: Ingo Molnar <mingo@kernel.org>

authored by

Davidlohr Bueso and committed by
Ingo Molnar
63dc47e9 188c9019

+2 -2
+2 -2
kernel/locking/mutex.c
··· 469 469 EXPORT_SYMBOL(ww_mutex_unlock); 470 470 471 471 static inline int __sched 472 - __mutex_lock_check_stamp(struct mutex *lock, struct ww_acquire_ctx *ctx) 472 + __ww_mutex_lock_check_stamp(struct mutex *lock, struct ww_acquire_ctx *ctx) 473 473 { 474 474 struct ww_mutex *ww = container_of(lock, struct ww_mutex, base); 475 475 struct ww_acquire_ctx *hold_ctx = ACCESS_ONCE(ww->ctx); ··· 557 557 } 558 558 559 559 if (use_ww_ctx && ww_ctx->acquired > 0) { 560 - ret = __mutex_lock_check_stamp(lock, ww_ctx); 560 + ret = __ww_mutex_lock_check_stamp(lock, ww_ctx); 561 561 if (ret) 562 562 goto err; 563 563 }