Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp5454038pxj; Wed, 23 Jun 2021 01:22:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxk+GjUoUBXIbdl4+JBscPwDsZQKycC4foycDqKuY1FKtd3+pg926Uh8AKp+L3xSffnvyEd X-Received: by 2002:a17:906:470c:: with SMTP id y12mr8943999ejq.54.1624436552574; Wed, 23 Jun 2021 01:22:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624436552; cv=none; d=google.com; s=arc-20160816; b=MwzQi8hUF3Dn+PnyGmJisAr6gfGnovCFm0Cbx9Wi9j7M21C4TTI0DLpJi2dfPyQgV4 vnAAqaspeQjYs2fV8KbVCcSZ2s1lpoQgrQZuK+wStnvPNbXoFFelzGJTxnWaKfRY2EWN 9aWk45tM5u5ZCq3RVv2MUcEI5KerrTAxXV/gexAOzb7KixZRHuftComZ3lfNDmKGws0G n/UtZ/flT1BPEjGELx98Mus9ynIlIjj1J1uVJ749DNKihVHD1itMyc8q3e/PB6YnKt7L IQbhYFFFsAKd/pgI0QLJ3c6y/zxaDgmPnxOYf+hZnAlPn8RT0TgNYEYilseCzJyp/3dn Ag4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=NpCzKvdaHwOORklxX4W5YgmNbX+jg/b7ZtCxW1/4cdc=; b=SU2pyuUtPeD39Nkpkvh9eFu0MsPn/VC6XRw5vC5YWtIIARuto+6CVt7dksmAFFT3LT uYcFrC5APxmylCp48Fzl8BQKWVsT1xp+7pYTzubUJjznOXYH2K4+7L0J7HxAjNdyqwAj XqZzIq39PAat1t0QJSflm78OOTYwTv/E0kYPvlK8/pOCIRljTJPdyoWDxxx8dlK+7sfs Wbxfy4wdivxMYCQY2HLVj3xL9AbbE8EWn2k5fHS4RMTYly8seM9ChjMLl3MZ7qcjDa7H 9Y8o+PMPhzKj+IVHxh1BU4SDpTFh2UgW5fICfWLB7qfHqDzuGHDPwvdzH4WDJoqM99N4 u0YA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=uQL2gI1g; dkim=neutral (no key) header.i=@linutronix.de; 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 d10si19434192edn.529.2021.06.23.01.22.10; Wed, 23 Jun 2021 01:22:32 -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=uQL2gI1g; dkim=neutral (no key) header.i=@linutronix.de; 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 S230013AbhFWIVe (ORCPT + 99 others); Wed, 23 Jun 2021 04:21:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229964AbhFWIV2 (ORCPT ); Wed, 23 Jun 2021 04:21:28 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1259C061760; Wed, 23 Jun 2021 01:19:10 -0700 (PDT) Date: Wed, 23 Jun 2021 08:19:06 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1624436346; h=from:from:sender:sender:reply-to: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=NpCzKvdaHwOORklxX4W5YgmNbX+jg/b7ZtCxW1/4cdc=; b=uQL2gI1gp8p9MM8bGaK4b0ffKG/8TXmowttMcVnNkCqDcN6Ik45GmrmPmUmIqJQjPH+EiY 4kwLyRFTOYBhnlHi7OJWAewP318kk1wm8MBQoZ52npy6z6QPiOhmlpUM+XrwvFgkO3FRSq FUmR1yPrkzNzHE9AAlb29RvWva7YY95Rs9vYmfEIrj5YN8kKTXKnPVurDzw5Q2qnjJ5QME eMVj6Wl9ZqGHgmu00RgMKZlOnZX6WceZqDkfLoqRf0vnOz5/f4+qJW31dDPPlBTKBPkmC+ DP9DS8rWZPinQZDa/CL5kwb2XQv+GZ8vtdgignpnPrpxEViVQ5e9D8sFGEIH+g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1624436346; h=from:from:sender:sender:reply-to: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=NpCzKvdaHwOORklxX4W5YgmNbX+jg/b7ZtCxW1/4cdc=; b=9ANl90uZGN4jM+ib0iooNqRUjg9ZktGxptx3jgMeQlscfuFDOVq7V5s6baEPjsBT+nRv6R evUAJImnTjbZpWAA== From: "tip-bot2 for Xiongwei Song" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/core] locking/lockdep: Correct the description error for check_redundant() Cc: Xiongwei Song , "Peter Zijlstra (Intel)" , Boqun Feng , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20210618130230.123249-1-sxwjean@me.com> References: <20210618130230.123249-1-sxwjean@me.com> MIME-Version: 1.0 Message-ID: <162443634605.395.8419234298182174439.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the locking/core branch of tip: Commit-ID: 0e8a89d49d45197770f2e57fb15f1bc9ded96eb0 Gitweb: https://git.kernel.org/tip/0e8a89d49d45197770f2e57fb15f1bc9ded96eb0 Author: Xiongwei Song AuthorDate: Fri, 18 Jun 2021 21:02:30 +08:00 Committer: Peter Zijlstra CommitterDate: Tue, 22 Jun 2021 16:42:09 +02:00 locking/lockdep: Correct the description error for check_redundant() If there is no matched result, check_redundant() will return BFS_RNOMATCH. Signed-off-by: Xiongwei Song Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Boqun Feng Link: https://lkml.kernel.org/r/20210618130230.123249-1-sxwjean@me.com --- kernel/locking/lockdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 0584b20..095c87f 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -2829,7 +2829,7 @@ static inline bool usage_skip(struct lock_list *entry, void *mask) * or not. If it can, -> dependency is already * in the graph. * - * Return BFS_RMATCH if it does, or BFS_RMATCH if it does not, return BFS_E* if + * Return BFS_RMATCH if it does, or BFS_RNOMATCH if it does not, return BFS_E* if * any error appears in the bfs search. */ static noinline enum bfs_result