linux-kernel - Re: [PATCH] watchdog: fix build error if define SOFTWARE

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <587bcbe0-8c83-8798-bdb4-fe189c1056ce@roeck-us.net>
Date:   Mon, 10 Apr 2017 14:43:34 -0700
From:   Guenter Roeck <linux@...ck-us.net>
To:     Shile Zhang <shile.zhang@...ia.com>,
        Wim Van Sebroeck <wim@...ana.be>
Cc:     linux-watchdog@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] watchdog: fix build error if define SOFTWARE_REBOOT

On 04/10/2017 07:39 AM, Shile Zhang wrote:
> To fix following build error when SOFTWARE_REBOOT is defined:
>
>   CC [M]  driver/watchdog/wdt_pci.o
> driver/watchdog/wdt_pci.c: In function 'wdtpci_interrupt':
> driver/watchdog/wdt_pci.c:335:3: error: too many arguments to function 'emergency_restart'
>    emergency_restart(NULL);
>    ^
> In file included from driver/watchdog/wdt_pci.c:51:0:
> include/linux/reboot.h:80:13: note: declared here
>  extern void emergency_restart(void);
>              ^
>
> Signed-off-by: Shile Zhang <shile.zhang@...ia.com>

Reviewed-by: Guenter Roeck <linux@...ck-us.net>

> ---
>  drivers/watchdog/wdt_pci.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
> index 48b2c05..bc7addc 100644
> --- a/drivers/watchdog/wdt_pci.c
> +++ b/drivers/watchdog/wdt_pci.c
> @@ -332,7 +332,7 @@ static irqreturn_t wdtpci_interrupt(int irq, void *dev_id)
>  		pr_crit("Would Reboot\n");
>  #else
>  		pr_crit("Initiating system reboot\n");
> -		emergency_restart(NULL);
> +		emergency_restart();
>  #endif
>  #else
>  		pr_crit("Reset in 5ms\n");
>