lkml.org 
[lkml]   [2018]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 4.4 29/63] watchdog: hpwdt: fix unused variable warning

Greg,

Sorry, if I'm missing something, but I see 3 patches for
hpwdt queued up for 4.4:

queue-4.4/watchdog-hpwdt-fix-unused-variable-warning.patch
queue-4.4/watchdog-hpwdt-smbios-check.patch
queue-4.4/watchdog-hpwdt-check-source-of-nmi.patch


Shouldn't there also be a 4.4 patch for

commit 2b3d89b402b085b08498e896c65267a145bed486
watchdog: hpwdt: Remove legacy NMI sourcing.

As there was for 4.15, 4.14, and 4.9?

commit 2b3d89b40 is the Spectre related patch.

thanks

Jerry Hoemann



On Fri, Mar 16, 2018 at 04:23:01PM +0100, Greg Kroah-Hartman wrote:
> 4.4-stable review patch. If anyone has any objections, please let me know.
>
> ------------------
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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.
>
> Fixes: 621174a92851 ("watchdog: hpwdt: Check source of NMI")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Reviewed-by: Jerry Hoemann <jerry.hoemann@hpe.com>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> ---
> drivers/watchdog/hpwdt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- a/drivers/watchdog/hpwdt.c
> +++ b/drivers/watchdog/hpwdt.c
> @@ -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
> */
>

--

-----------------------------------------------------------------------------
Jerry Hoemann Software Engineer Hewlett Packard Enterprise
-----------------------------------------------------------------------------

\
 
 \ /
  Last update: 2018-03-16 23:56    [W:0.281 / U:1.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site