From patchwork Tue Aug 10 06:24:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: thermal-bot for Julien Panis X-Patchwork-Id: 495942 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C965DC4338F for ; Tue, 10 Aug 2021 06:24:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9ED5161073 for ; Tue, 10 Aug 2021 06:24:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237770AbhHJGYf (ORCPT ); Tue, 10 Aug 2021 02:24:35 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:40966 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234937AbhHJGYe (ORCPT ); Tue, 10 Aug 2021 02:24:34 -0400 Date: Tue, 10 Aug 2021 06:24:10 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1628576652; 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=fnn2uGllU/uDP9M/5maKWBV/knLD9AVUGcT5bladcBk=; b=RU69zWxAXIWfVNAEzbwPaiUbKNcdbF3AHIh2bLqp/TbER42JU/yut3IAuh7wtxhC0rAJ75 n0Eyvn52sO04vNG6jVJXCEkdI+awWYqVHmWAfox3pskd2fV9KTO8byh6Dm+XRj9p9kuiTN o4EI9rBwxu3qJKWdiI/TcstCl/Lwnkqpi4Wsnjok5qLpW7u8SqFA76RPdUBSqIGeN9vCd/ uDOma7XiPmheLR1y94YgLwqWDLu1M1yj4/TGJDuxkF+WmD9HfXT/08F/7OX3b37BA5Ttwv gENf3Ge39CkBaz9S9K1uGwADqCfcHIO3Fpfp3qO7Nqsa5MzQCBcgJf5VD2KUpg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1628576652; 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=fnn2uGllU/uDP9M/5maKWBV/knLD9AVUGcT5bladcBk=; b=qyYK7gQdLaNbt+9UV38pAAlhYgyqe63fct1EPGJjuQuj9wnlBG6zjF4idiReFEZzvi3JL0 ZDVc9TF8qGOXw8Dg== From: "tip-bot2 for Zhen Lei" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/urgent] locking/rtmutex: Use the correct rtmutex debugging config option Cc: Zhen Lei , Thomas Gleixner , Will Deacon , Boqun Feng , stable@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20210731123011.4555-1-thunder.leizhen@huawei.com> References: <20210731123011.4555-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 Message-ID: <162857665079.395.8061796683786312705.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The following commit has been merged into the locking/urgent branch of tip: Commit-ID: 07d25971b220e477eb019fcb520a9f2e3ac966af Gitweb: https://git.kernel.org/tip/07d25971b220e477eb019fcb520a9f2e3ac966af Author: Zhen Lei AuthorDate: Sat, 31 Jul 2021 20:30:11 +08:00 Committer: Thomas Gleixner CommitterDate: Tue, 10 Aug 2021 08:21:52 +02:00 locking/rtmutex: Use the correct rtmutex debugging config option It's CONFIG_DEBUG_RT_MUTEXES not CONFIG_DEBUG_RT_MUTEX. Fixes: f7efc4799f81 ("locking/rtmutex: Inline chainwalk depth check") Signed-off-by: Zhen Lei Signed-off-by: Thomas Gleixner Acked-by: Will Deacon Acked-by: Boqun Feng Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20210731123011.4555-1-thunder.leizhen@huawei.com --- kernel/locking/rtmutex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index b5d9bb5..ad0db32 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -343,7 +343,7 @@ static __always_inline bool rt_mutex_cond_detect_deadlock(struct rt_mutex_waiter *waiter, enum rtmutex_chainwalk chwalk) { - if (IS_ENABLED(CONFIG_DEBUG_RT_MUTEX)) + if (IS_ENABLED(CONFIG_DEBUG_RT_MUTEXES)) return waiter != NULL; return chwalk == RT_MUTEX_FULL_CHAINWALK; }