From: "tip-bot2 for Sebastian Andrzej Siewior" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: locking/core] kernel/locking: Use a pointer in ww_mutex_trylock().
Date: Wed, 17 Nov 2021 13:59:41 -0000 [thread overview]
Message-ID: <163715758187.11128.891998814032181051.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20211104122706.frk52zxbjorso2kv@linutronix.de>
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;
}
next prev parent reply other threads:[~2021-11-17 13:59 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-07 13:20 [PATCH] kernel/locking: Add context to ww_mutex_trylock Maarten Lankhorst
2021-09-08 10:14 ` Peter Zijlstra
2021-09-08 18:30 ` Daniel Vetter
2021-09-09 5:38 ` Maarten Lankhorst
2021-09-09 8:22 ` Peter Zijlstra
2021-09-09 9:32 ` [PATCH v2] " Maarten Lankhorst
2021-09-10 15:02 ` Peter Zijlstra
2021-09-10 17:27 ` Peter Zijlstra
2021-09-13 8:42 ` Maarten Lankhorst
2021-09-14 6:50 ` Peter Zijlstra
2021-09-14 12:43 ` Maarten Lankhorst
2021-09-14 13:54 ` Daniel Vetter
2021-09-16 13:00 ` Maarten Lankhorst
2021-09-16 13:28 ` Peter Zijlstra
2021-09-17 13:13 ` Peter Zijlstra
2021-09-20 15:02 ` Joonas Lahtinen
2021-09-17 13:17 ` [tip: locking/core] kernel/locking: Add context to ww_mutex_trylock() tip-bot2 for Maarten Lankhorst
2021-11-04 12:27 ` [PATCH] kernel/locking: Use a pointer in ww_mutex_trylock() Sebastian Andrzej Siewior
2021-11-17 13:59 ` tip-bot2 for Sebastian Andrzej Siewior [this message]
2021-09-10 18:06 ` [PATCH v2] kernel/locking: Add context to ww_mutex_trylock Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=163715758187.11128.891998814032181051.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bigeasy@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®