]> git.baikalelectronics.ru Git - kernel.git/commitdiff
watchdog: wdt_pci: fix build error if define SOFTWARE_REBOOT
authorShile Zhang <shile.zhang@nokia.com>
Mon, 10 Apr 2017 14:39:33 +0000 (22:39 +0800)
committerWim Van Sebroeck <wim@iguana.be>
Thu, 18 May 2017 16:51:44 +0000 (18:51 +0200)
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>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/wdt_pci.c

index 48b2c058b00910ffee5a313812b5cb4d0ee135c5..bc7addc2dc06d0f9ca4bfa09abdbedfb4252090f 100644 (file)
@@ -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");