lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0146/1039] kernel/locking: Use a pointer in ww_mutex_trylock().
    Date
    From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

    [ Upstream commit 2202e15b2b1a946ce760d96748cd7477589701ab ]

    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
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 0e00205cf467a..d1473c624105c 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;
    }

    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-25 01:11    [W:2.154 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site