Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3694465pxb; Mon, 24 Jan 2022 15:34:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJwRYu1XAqwYLbfcHbRotypnWKi6pnfvh0jwDvnKuOnS61JXFndYkFwqLzeWaMmnFbG50kkB X-Received: by 2002:a17:902:d485:b0:14b:cd:8f93 with SMTP id c5-20020a170902d48500b0014b00cd8f93mr16403426plg.75.1643067273509; Mon, 24 Jan 2022 15:34:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643067273; cv=none; d=google.com; s=arc-20160816; b=Oq3Ddc30QjA8yfpSM9MJgxY3GyTZdlCMT6trjPpECfFZjpxOr97VX4QlKtPauNbKsI r+IWoV+i6OXafhh233SXaNtRn0iUGSNA5JjoanUQri3WpBTsAvS/CYA3jKlUBVyYqInD tV7p6snQv5qOQFw1YGORA0sNAmmAtRPzNzBNqNjsJ5t3oXvYpWWwMPmxgFjqD3PXww32 IO4Ci7uF2I6Op+NAoHpQrZcqfV2eyqMx7yYKv20V8LYwTpSJVqJe5Tk9oCRuTbvHSNzT OcgKjLvGmSbZL2HtyS7nokk58cijImHKzAf/bFMtQVhA/xvmxp28zBcZ92AbQpXAl8hc SyrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1SwK8XSGCPQTP1lcoqhWG0sTuomgP1/4LCzwXFP9gBo=; b=xEQUWMHFNNz8uZqj+SlByhcxMIDy/40IFXE5ReQiXE3MMsnV1D7pWTChR9algPV+1Z Qd8Q6Ce0GKcj7exK7tDUx/9eb4jDLKPREpgzPzreJchup9ZXForGqCpQixy9WZISrajp KLBtvOaUyETcERuP+JkApcxQc79yG0ND9KouWnVWnzniywPNJMZeeDTVvOPV7VVCwKGK HR1wYwAIt3Cahb2EDBtH6zzPMxijm35ot+2rvAn4AlnsY3lgarMR+a9F9V+GmHGsa1+Q h5h8huVvUAKDXFOm1sJcmEcZlGvgRCwXlHBEMqH7PYm91GcC+q2phYcadkYmRDrxIJsO 3RtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CrBTqfhc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 16si16300617pgs.428.2022.01.24.15.34.21; Mon, 24 Jan 2022 15:34:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CrBTqfhc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1849546AbiAXX0F (ORCPT + 99 others); Mon, 24 Jan 2022 18:26:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1835934AbiAXWhs (ORCPT ); Mon, 24 Jan 2022 17:37:48 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F9B5C02B871; Mon, 24 Jan 2022 12:59:54 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0D67E612E9; Mon, 24 Jan 2022 20:59:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7BCEC340E5; Mon, 24 Jan 2022 20:59:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643057993; bh=Awjc1r/8AS2b08K/MPXxdKLbb1VLsp2k2khdbnO2o44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CrBTqfhcUQz28eMRefPkliTE6ZC9NJXM5zyF/QNmx9zIz3IMN6iGU8Yu47w5Ouw7p ZG9EOWHqQgBcrMnXCZ9IGCO8RDsCTqr1jDRr0GPA2iJIk4A0wHaBrJl0d9OshlbG8C +2O4CTD0Uamx24HTRzsbhkqyuKH44UkKF9h8eMoU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sebastian Andrzej Siewior , "Peter Zijlstra (Intel)" , Sasha Levin Subject: [PATCH 5.16 0146/1039] kernel/locking: Use a pointer in ww_mutex_trylock(). Date: Mon, 24 Jan 2022 19:32:15 +0100 Message-Id: <20220124184130.078742854@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184125.121143506@linuxfoundation.org> References: <20220124184125.121143506@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sebastian Andrzej Siewior [ 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 Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20211104122706.frk52zxbjorso2kv@linutronix.de Signed-off-by: Sasha Levin --- 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