projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'rpmsg-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc...
[platform/kernel/linux-rpi.git]
/
kernel
/
locking
/
ww_rt_mutex.c
diff --git
a/kernel/locking/ww_rt_mutex.c
b/kernel/locking/ww_rt_mutex.c
index
0e00205
..
d1473c6
100644
(file)
--- 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;
}