Groups > linux.kernel > #1620750

Re: [PATCH] watchdog: fix build error if define SOFTWARE_REBOOT

From	Guenter Roeck <linux@roeck-us.net>
Newsgroups	linux.kernel
Subject	Re: [PATCH] watchdog: fix build error if define SOFTWARE_REBOOT
Date	2017-04-10 23:50 +0200
Message-ID	<tuPm9-6ni-3@gated-at.bofh.it> (permalink)
References	<tuPm9-6ni-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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@nokia.com>

Reviewed-by: Guenter Roeck <linux@roeck-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");
>

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

Re: [PATCH] watchdog: fix build error if define SOFTWARE_REBOOT Guenter Roeck <linux@roeck-us.net> - 2017-04-10 23:50 +0200

csiph-web