From patchwork Mon Aug 16 13:02:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 497659 Delivered-To: patch@linaro.org Received: by 2002:a02:6f15:0:0:0:0:0 with SMTP id x21csp90551jab; Mon, 16 Aug 2021 06:21:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1usuAE68q8dWOeJfiROby05mDnjW+ySUyuU0gmTgOTKsqvc+mGs+/xCT2YlFr17vH0AzC X-Received: by 2002:a05:6402:2029:: with SMTP id ay9mr18021839edb.236.1629120117955; Mon, 16 Aug 2021 06:21:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629120117; cv=none; d=google.com; s=arc-20160816; b=UVaTmY+ycx10ZJtiFWqBzuMds2jgQaXrasT8ZShPGwNXYmuQcZvog5OZ/MZobQdLjZ V6JMpvvcznbcIjUvGk6YVOQq9qSfk04RladtlNy7KON3DqsJOxTahOOlNeq88jpHmkAo u6pvsgjlPa0KCNeE9nFn2G7ZeYdu/ybMZ2ITAZXeli5CkTgLxvbm3tLEyLG4hPUngLZM g2OEyqw4uiO0lNAASu8QUDTSYTN9n9kq0WN+BwImadDOr2ouLKobjlguVRVtnl3fIxWH F3C+VLewBfArBvSZSCgPlUaBtHAbxU/pIX9o60GplAikF9LA77EwzOhAvHqZXX/09US9 jFXQ== 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=ZvjUfJ5cIDAT/VKHfYMrdq8fs6Cuz4z+o3wAWrneh5I=; b=RXC84MkOyENnQTVpbnn/o2us/0My3RX8FW2C47OzZ9q9/urYATSiCNdDDPQmckxiWO r2bME6qz1c3R+a6uyg5bqYDhL2OWFLP1l0ewdpl+qjnbqsDNdXU1u5pbjpPUKsSCcxe/ OiT5slevkbumx3s0t9EdVlGfEaFyxah+bMMWXCkmU7yWkukrurgit0N5TAKiZDSODNFM u9Tip+Vcc6srcPv5m1tZ/jDumcB720HlikDYwFMb0A1DcURKP0m2Bw1zJXIIpdXrjZT4 UlCHQsxpGFtbL4rq2x9lOL+FSFE3xH+I8/emfTJIDobbb2CUsSWA89tR0IjEtMaJFvik Vvgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xFLDcvvU; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 z7si3420761edc.144.2021.08.16.06.21.57; Mon, 16 Aug 2021 06:21:57 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=xFLDcvvU; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S240079AbhHPNW0 (ORCPT + 12 others); Mon, 16 Aug 2021 09:22:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:44276 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240940AbhHPNUY (ORCPT ); Mon, 16 Aug 2021 09:20:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EFF1263311; Mon, 16 Aug 2021 13:15:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1629119736; bh=kJmcgmGYi640eHzY2tZWsTqNiJQOUQshw2kZV8uqb04=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xFLDcvvUzgsGwYvIjmDMwNcBxSKAEdD4tMujMDLwzM8qgYo4pF/5ea02TDeDxeMwh Zj1KCoKhsoJwzLkKv6OslECJ2mweZCqGjWvwmrcyxd3Yg6RxO7fuViJnj2OToMfnuV jGrpWP1Cilk53/rFcbc0QxlJ9LH0c1BaStz4qR+k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhen Lei , Thomas Gleixner , Will Deacon , Boqun Feng Subject: [PATCH 5.13 143/151] locking/rtmutex: Use the correct rtmutex debugging config option Date: Mon, 16 Aug 2021 15:02:53 +0200 Message-Id: <20210816125448.785163932@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210816125444.082226187@linuxfoundation.org> References: <20210816125444.082226187@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei commit 07d25971b220e477eb019fcb520a9f2e3ac966af upstream. 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 Signed-off-by: Greg Kroah-Hartman --- kernel/locking/rtmutex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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; }