Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp3862908pxb; Tue, 17 Nov 2020 05:40:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJwrjE3SDKytbgdSDgHdXrrTPpJY6D775OoI3PLEIIYfqHP2zPoeSvIcWs4NsQyCCul3QP+j X-Received: by 2002:a17:906:3a1a:: with SMTP id z26mr18815036eje.519.1605620414646; Tue, 17 Nov 2020 05:40:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605620414; cv=none; d=google.com; s=arc-20160816; b=ivl/h8aT7LaZMkqOSDa56luusrsk0khQl7qn+eSA2wGft8gBwcU1CF+CT21bCAo/9x bKpdvcz0NzDw5VrhF77remdnywYhqbhOBX3cydDPk7Dh6xzekpRhm/jpd4dsCBSA13LN t2ZW8OOweLNPMxy3N6paXVWp/s1yhQOyrs/iRS+h0uzpBh/Ja8Z9a1bnk3z8E0PLHCh4 pJLXZ1H4L2dGHig62CkJjsm5zvNoh+TIobGcAp7bnLPNsopU9D1zQuqBqRZwZTpJCh3A 6mECC8YII/nfYq2gacYzI90OlGzh5kUG79a0A//fxBb6DDyiWSKSi/q0KyXkoCsp0Mew RjPg== 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=caUYCxgyr3sN6CoqV63mxwa9S2aDTtj3BMhi9ClcNOA=; b=O1zSh+0wePt6bMK1EAbk2xa58DMJNf8mNgXjXE24FywiqcAQ2lIN7NYyqPIKTGo105 B+J17yRwWKbwvLv8zA2gPgocDA8f5oFhr8sMUlrf1g7+FuzykG2r9TY//EqGwEgCpOYD b4Izi2vAI/G5Rf7/KWjHtiQxeO9g+d/0i8Wr+ULglmkvz57D5S3oHomr5tY8eyUevmNp YosM2ycJWYHvK/ZI03Nk3VI98P6CwPbkAkOWXCDL29aUc5Jt50z4QKFLlk5ZxXIE15b9 aZqJEtcmAn35lpX8pq4xaJ4JcI/bzaUqBfxxa+D9YPIZ0ckfnHX3fJpqeVEkN7PnH7Ua zbyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RuQWhAgF; 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=fail (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 ec4si13722270ejb.549.2020.11.17.05.39.52; Tue, 17 Nov 2020 05:40:14 -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=@kernel.org header.s=default header.b=RuQWhAgF; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732447AbgKQNi2 (ORCPT + 99 others); Tue, 17 Nov 2020 08:38:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:49922 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732141AbgKQNiY (ORCPT ); Tue, 17 Nov 2020 08:38:24 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 906E7207BC; Tue, 17 Nov 2020 13:38:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605620304; bh=8Yj56os2CI7ZMPGldQMNyJxKKQeMsDZMotnx2ApuvEA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RuQWhAgFGYEVV1521DTb8RS0+T4l9UqqnOOYkKuCT75ZOcYFQqwwhXEBjsR3C3iw5 Hv+1duePL7mJn0mYAvcy3J/B3aB6k8t/0F+0wzLKkBIffmR0wmMbhK/8GcrlCib5sY UPcQ19v3e+bESMYjkvPH42lD8rBEveMA6g9uiGJg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Santosh Sivaraj , Andrew Morton , Petr Mladek , Thomas Gleixner , Linus Torvalds , Sasha Levin Subject: [PATCH 5.9 173/255] kernel/watchdog: fix watchdog_allowed_mask not used warning Date: Tue, 17 Nov 2020 14:05:13 +0100 Message-Id: <20201117122147.344601838@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201117122138.925150709@linuxfoundation.org> References: <20201117122138.925150709@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: Santosh Sivaraj [ Upstream commit e7e046155af04cdca5e1157f28b07e1651eb317b ] Define watchdog_allowed_mask only when SOFTLOCKUP_DETECTOR is enabled. Fixes: 7feeb9cd4f5b ("watchdog/sysctl: Clean up sysctl variable name space") Signed-off-by: Santosh Sivaraj Signed-off-by: Andrew Morton Reviewed-by: Petr Mladek Cc: Thomas Gleixner Link: https://lkml.kernel.org/r/20201106015025.1281561-1-santosh@fossix.org Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- kernel/watchdog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 5abb5b22ad130..71109065bd8eb 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -44,8 +44,6 @@ int __read_mostly soft_watchdog_user_enabled = 1; int __read_mostly watchdog_thresh = 10; static int __read_mostly nmi_watchdog_available; -static struct cpumask watchdog_allowed_mask __read_mostly; - struct cpumask watchdog_cpumask __read_mostly; unsigned long *watchdog_cpumask_bits = cpumask_bits(&watchdog_cpumask); @@ -162,6 +160,8 @@ static void lockup_detector_update_enable(void) int __read_mostly sysctl_softlockup_all_cpu_backtrace; #endif +static struct cpumask watchdog_allowed_mask __read_mostly; + /* Global variables, exported for sysctl */ unsigned int __read_mostly softlockup_panic = CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE; -- 2.27.0