Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp1606979pxb; Thu, 4 Nov 2021 05:29:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxc0VZwW6MQF3GlU7Qh4dxdW+9Ed/dnGVabZ7phn8+L+Khar0JbfVHzmV0m/5aOuWlVsF52 X-Received: by 2002:a17:906:2cd5:: with SMTP id r21mr64414719ejr.435.1636028994313; Thu, 04 Nov 2021 05:29:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1636028994; cv=none; d=google.com; s=arc-20160816; b=tJES/xPq3ZsSgNdWj/GU64kcJkPlBus6ZCMcNsM7L7P7X0RIok5vgYNLvEuvkKXGxd DQqdTtT/CxYUS7ak3Ch3MCjfWniWcsuT6Lhdy2IK8SlsBaYbeZNnoQbfRXsxU5um2mcF yRIdZgigZjULk7B62LxYPvKvw44fXE39gQjnzYBmoKKzjglptkdADGMNofjzBQRPhwZB WnZIMXphxUo0FNbkQVB6jE7MKWgXyJ534RrZdbSOPpyJ7/FGcrqpDWBJzQa9asnsq8c9 TAkeFdVBIhX+Jmm/d1ev9VRRX985FcCgG+jhi95eyeXFITcvm9Sf/z8nIB8bs4yGWm7U 2sMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:dkim-signature:dkim-signature:date; bh=M6NqONrvOq66l/QYoFSVwjLleMhO22wOW4bvAS2dEVY=; b=I77GYva7zC0/f3SJKoAYcc2lyhF+RzoOiEua1SqhK6R4kkQjYy29xv8OkEdPwlhJD9 CB7WeNWwTU7+RvhBHvQI4BWaX9RIko7x6wpzHw2FU88Jey13Vzc9nmYBzK60CXqEjLP8 D4qxieZ58ph82aQab+AIHRraxQVSz6f6dgG9fN6GDqebRlTwCwNZKmeAAepK7wT2nqD2 X8EFCakya7PIZ4ijq00fP/ITA6bnP6K1JVyozW/qE2VCas+5QXm2c2rBxmrDlhiBtwKK AvnORustA/SSnOrfUgFt4IGD9qFqBU9NMCnv8JaKGPdyv2sUdFIvnmo9XImRh7ocThNh v+Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=NKcXU5k1; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="UyK9WVi/"; 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=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id qw11si10236057ejc.59.2021.11.04.05.29.30; Thu, 04 Nov 2021 05:29:54 -0700 (PDT) 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=@linutronix.de header.s=2020 header.b=NKcXU5k1; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="UyK9WVi/"; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230252AbhKDM3s (ORCPT + 99 others); Thu, 4 Nov 2021 08:29:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229809AbhKDM3s (ORCPT ); Thu, 4 Nov 2021 08:29:48 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2187AC061714 for ; Thu, 4 Nov 2021 05:27:10 -0700 (PDT) Date: Thu, 4 Nov 2021 13:27:06 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1636028827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M6NqONrvOq66l/QYoFSVwjLleMhO22wOW4bvAS2dEVY=; b=NKcXU5k15e0NQfoYe+CBkb6tOMToV22terwbv/9kO1t2Hfha8/qkxJ/zExQbtnpZH6X93R PzUnSXkvFDDG4FGUDum9qM+EwYxcn1y3mHBpsqzfo78UwuhOMQnzSWJnuN9ymEjyhPB0k3 AefuaLV6UO9aOVpis7RwqDu/UgVR67ETUdoRO0NhQxLoM6MVMWotVASNcy8fd7hzrzAM6R +TrBo/IxiK/WebTFrVh66GvhN4Co2P/OZaJ84k0RJPH5itXdwBUKVoXqoS0OKpo3JoF47H da8loeWJNeAPrCXC3Gz8VGEqqoKnHOQgG6VcKchkscWZWTFT5T9/8LN9iYE8RA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1636028827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M6NqONrvOq66l/QYoFSVwjLleMhO22wOW4bvAS2dEVY=; b=UyK9WVi/iF5JBJwpnzicusVrisGdl3Ncs9v/wBkhufwv8oLWvxDPOnxbS1NFB81TKyuj4q TQLBdzJcUcjgwHAg== From: Sebastian Andrzej Siewior To: Peter Zijlstra Cc: Maarten Lankhorst , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Ingo Molnar , Will Deacon , Waiman Long , Boqun Feng , Liam Girdwood , Mark Brown , linux-kernel@vger.kernel.org, Daniel Vetter , Thomas Gleixner Subject: [PATCH] kernel/locking: Use a pointer in ww_mutex_trylock(). Message-ID: <20211104122706.frk52zxbjorso2kv@linutronix.de> References: <20210907132044.157225-1-maarten.lankhorst@linux.intel.com> <96ab9cf1-250a-8f34-51ec-4a7f66a87b39@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- Not sure why I haven't seen this earlier=E2=80=A6 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_acq= uire_ctx *ww_ctx) =20 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; } =20 --=20 2.33.1