projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf
[linux-block.git]
/
include
/
linux
/
nmi.h
diff --git
a/include/linux/nmi.h
b/include/linux/nmi.h
index 750c7f395ca907f772ad8e784e6df32e473ead72..f700ff2df074e783dee0ab8117835701f71d80ef 100644
(file)
--- a/
include/linux/nmi.h
+++ b/
include/linux/nmi.h
@@
-122,6
+122,8
@@
int watchdog_nmi_probe(void);
int watchdog_nmi_enable(unsigned int cpu);
void watchdog_nmi_disable(unsigned int cpu);
+void lockup_detector_reconfigure(void);
+
/**
* touch_nmi_watchdog - restart NMI watchdog timeout.
*