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/ice1724-pm' into for-linus
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
cpu
/
perfctr-watchdog.c
diff --git
a/arch/x86/kernel/cpu/perfctr-watchdog.c
b/arch/x86/kernel/cpu/perfctr-watchdog.c
index
5c481f6
..
e60ed74
100644
(file)
--- a/
arch/x86/kernel/cpu/perfctr-watchdog.c
+++ b/
arch/x86/kernel/cpu/perfctr-watchdog.c
@@
-803,8
+803,3
@@
int __kprobes lapic_wd_event(unsigned nmi_hz)
wd_ops->rearm(wd, nmi_hz);
return 1;
}
-
-int lapic_watchdog_ok(void)
-{
- return wd_ops != NULL;
-}