Skip to content

Commit e7e0461

Browse files
santoshstorvalds
authored andcommitted
kernel/watchdog: fix watchdog_allowed_mask not used warning
Define watchdog_allowed_mask only when SOFTLOCKUP_DETECTOR is enabled. Fixes: 7feeb9c ("watchdog/sysctl: Clean up sysctl variable name space") Signed-off-by: Santosh Sivaraj <santosh@fossix.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: Petr Mladek <pmladek@suse.com> Cc: Thomas Gleixner <tglx@linutronix.de> Link: https://lkml.kernel.org/r/20201106015025.1281561-1-santosh@fossix.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent df5b0ab commit e7e0461

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

kernel/watchdog.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ int __read_mostly soft_watchdog_user_enabled = 1;
4444
int __read_mostly watchdog_thresh = 10;
4545
static int __read_mostly nmi_watchdog_available;
4646

47-
static struct cpumask watchdog_allowed_mask __read_mostly;
48-
4947
struct cpumask watchdog_cpumask __read_mostly;
5048
unsigned long *watchdog_cpumask_bits = cpumask_bits(&watchdog_cpumask);
5149

@@ -162,6 +160,8 @@ static void lockup_detector_update_enable(void)
162160
int __read_mostly sysctl_softlockup_all_cpu_backtrace;
163161
#endif
164162

163+
static struct cpumask watchdog_allowed_mask __read_mostly;
164+
165165
/* Global variables, exported for sysctl */
166166
unsigned int __read_mostly softlockup_panic =
167167
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE;

0 commit comments

Comments
 (0)