Patch "watchdog: hpwdt: fix unused variable warning" has been added to the 4.4-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
watchdog: hpwdt: fix unused variable warning
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
watchdog-hpwdt-fix-unused-variable-warning.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
aeebc6ba88ba3758ad95467ff6191fabf2074c13Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Wed, 6 Dec 2017 22:02:37 +0100
Subject: watchdog: hpwdt: fix unused variable warning
From: Arnd Bergmann <[email protected]>
commit aeebc6ba88ba3758ad95467ff6191fabf2074c13 upstream.
The new hpwdt_my_nmi() function is used conditionally, which produces a harmless warning in some configurations:
drivers/watchdog/hpwdt.c:478:12: error: 'hpwdt_my_nmi' defined but not used [-Werror=unused-function]
This moves it inside of the #ifdef that protects its caller, to silence the warning.
--- drivers/watchdog/hpwdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/hpwdt.c +1 -1
@@ -474,12 +474,12 @@ static int hpwdt_time_left(void)return TICKS_TO_SECS (ioread16 (hpwdt_timer_reg)); } +#ifdef CONFIG_HPWDT_NMI_DECODING static int hpwdt_my_nmi (void ) {return ioread8 (hpwdt_nmistat) &0x6 ; } -#ifdef CONFIG_HPWDT_NMI_DECODING /* * NMI Handler */
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/watchdog-hpwdt-fix-unused-variable-warning.patch