summaryrefslogtreecommitdiffstats
path: root/include/linux/nmi.h
diff options
context:
space:
mode:
authorMandeep Singh Baines <msb@chromium.org>2011-05-22 22:10:22 -0700
committerIngo Molnar <mingo@elte.hu>2011-05-23 11:58:59 +0200
commit586692a5a5fc5740c8a46abc0f2365495c2d7c5f (patch)
treebc08228e67a968d83691c9efc5ea1feda9e6f98b /include/linux/nmi.h
parente04ab2bc41b35c0cb6cdb07c8443f91aa738cf78 (diff)
downloadop-kernel-dev-586692a5a5fc5740c8a46abc0f2365495c2d7c5f.zip
op-kernel-dev-586692a5a5fc5740c8a46abc0f2365495c2d7c5f.tar.gz
watchdog: Disable watchdog when thresh is zero
This restores the previous behavior of softlock_thresh. Currently, setting watchdog_thresh to zero causes the watchdog kthreads to consume a lot of CPU. In addition, the logic of proc_dowatchdog_thresh and proc_dowatchdog_enabled has been factored into proc_dowatchdog. Signed-off-by: Mandeep Singh Baines <msb@chromium.org> Cc: Marcin Slusarz <marcin.slusarz@gmail.com> Cc: Don Zickus <dzickus@redhat.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Frederic Weisbecker <fweisbec@gmail.com> Link: http://lkml.kernel.org/r/1306127423-3347-3-git-send-email-msb@chromium.org Signed-off-by: Ingo Molnar <mingo@elte.hu> LKML-Reference: <20110517071018.GE22305@elte.hu>
Diffstat (limited to 'include/linux/nmi.h')
-rw-r--r--include/linux/nmi.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index c536f85..5317b8b 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -47,9 +47,10 @@ static inline bool trigger_all_cpu_backtrace(void)
int hw_nmi_is_cpu_stuck(struct pt_regs *);
u64 hw_nmi_get_sample_period(void);
extern int watchdog_enabled;
+extern int watchdog_thresh;
struct ctl_table;
-extern int proc_dowatchdog_enabled(struct ctl_table *, int ,
- void __user *, size_t *, loff_t *);
+extern int proc_dowatchdog(struct ctl_table *, int ,
+ void __user *, size_t *, loff_t *);
#endif
#endif
OpenPOWER on IntegriCloud