git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/cleanup' into for-linus
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
nmi.h
diff --git
a/arch/x86/include/asm/nmi.h
b/arch/x86/include/asm/nmi.h
index
c972644
..
c86e5ed
100644
(file)
--- a/
arch/x86/include/asm/nmi.h
+++ b/
arch/x86/include/asm/nmi.h
@@
-72,7
+72,6
@@
void lapic_watchdog_stop(void);
int lapic_watchdog_init(unsigned nmi_hz);
int lapic_wd_event(unsigned nmi_hz);
unsigned lapic_adjust_nmi_hz(unsigned hz);
-int lapic_watchdog_ok(void);
void disable_lapic_nmi_watchdog(void);
void enable_lapic_nmi_watchdog(void);
void stop_nmi(void);