From dd670e09a4eb4edddf7452e4a0e7271d38272170 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 27 Jun 2017 10:30:33 +0200 Subject: [PATCH] Revert "ANDROID: kernel/watchdog: fix unused variable warning" This reverts commit b5ea92ffa88e9d4d6ba8fc2da32be942ed87ce88. We need to do this for some merge issues with 4.9.32, the commit will be put back later... Cc: Brian Norris Signed-off-by: Greg Kroah-Hartman --- kernel/watchdog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/watchdog.c b/kernel/watchdog.c index ea6271bed784..1970037b6029 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -120,7 +120,7 @@ static unsigned long soft_lockup_nmi_warn; #ifdef CONFIG_HARDLOCKUP_DETECTOR unsigned int __read_mostly hardlockup_panic = CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE; -static unsigned long __maybe_unused hardlockup_allcpu_dumped; +static unsigned long hardlockup_allcpu_dumped; /* * We may not want to enable hard lockup detection by default in all cases, * for example when running the kernel as a guest on a hypervisor. In these