projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/~dwmw2/cafe-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
char
/
ipmi
/
ipmi_watchdog.c
diff --git
a/drivers/char/ipmi/ipmi_watchdog.c
b/drivers/char/ipmi/ipmi_watchdog.c
index accaaf1a6b697fb6c5604f290464a43d8b56a53f..73f759eaa5a6a2a777e733cf9da9bf8b4c7fa9e9 100644
(file)
--- a/
drivers/char/ipmi/ipmi_watchdog.c
+++ b/
drivers/char/ipmi/ipmi_watchdog.c
@@
-903,7
+903,7
@@
static void ipmi_register_watchdog(int ipmi_intf)
#ifdef HAVE_NMI_HANDLER
static int
-ipmi_nmi(void *dev_id,
struct pt_regs *regs,
int cpu, int handled)
+ipmi_nmi(void *dev_id, int cpu, int handled)
{
/* If we are not expecting a timeout, ignore it. */
if (ipmi_watchdog_state == WDOG_TIMEOUT_NONE)