Messages in this thread Patch in this message | | | Date | Wed, 17 Nov 2021 13:59:41 -0000 | From | "tip-bot2 for Sebastian Andrzej Siewior" <> | Subject | [tip: locking/core] kernel/locking: Use a pointer in ww_mutex_trylock(). |
| |
The following commit has been merged into the locking/core branch of tip:
Commit-ID: 2202e15b2b1a946ce760d96748cd7477589701ab Gitweb: https://git.kernel.org/tip/2202e15b2b1a946ce760d96748cd7477589701ab Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de> AuthorDate: Thu, 04 Nov 2021 13:27:06 +01:00 Committer: Peter Zijlstra <peterz@infradead.org> CommitterDate: Wed, 17 Nov 2021 14:48:49 +01:00
kernel/locking: Use a pointer in ww_mutex_trylock().
mutex_acquire_nest() expects a pointer, pass the pointer.
Fixes: 12235da8c80a1 ("kernel/locking: Add context to ww_mutex_trylock()") Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/20211104122706.frk52zxbjorso2kv@linutronix.de --- kernel/locking/ww_rt_mutex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/locking/ww_rt_mutex.c b/kernel/locking/ww_rt_mutex.c index 0e00205..d1473c6 100644 --- a/kernel/locking/ww_rt_mutex.c +++ b/kernel/locking/ww_rt_mutex.c @@ -26,7 +26,7 @@ int ww_mutex_trylock(struct ww_mutex *lock, struct ww_acquire_ctx *ww_ctx) if (__rt_mutex_trylock(&rtm->rtmutex)) { ww_mutex_set_context_fastpath(lock, ww_ctx); - mutex_acquire_nest(&rtm->dep_map, 0, 1, ww_ctx->dep_map, _RET_IP_); + mutex_acquire_nest(&rtm->dep_map, 0, 1, &ww_ctx->dep_map, _RET_IP_); return 1; }
| |