diff options
| author |   Mandeep Singh Baines <msb@chromium.org> | 2011-05-22 22:10:22 -0700 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2011-05-23 11:58:59 +0200 |
| commit | 586692a5a5fc5740c8a46abc0f2365495c2d7c5f (patch) | |
| tree | bc08228e67a968d83691c9efc5ea1feda9e6f98b /include | |
| parent | watchdog: Only disable/enable watchdog if neccessary (diff) | |
| download | linux-dev-586692a5a5fc5740c8a46abc0f2365495c2d7c5f.tar.xz linux-dev-586692a5a5fc5740c8a46abc0f2365495c2d7c5f.zip | |
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')
| -rw-r--r-- | include/linux/nmi.h | 5 | ||||
| -rw-r--r-- | include/linux/sched.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/nmi.h b/include/linux/nmi.h index c536f8545f74..5317b8b2198f 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 diff --git a/include/linux/sched.h b/include/linux/sched.h index 12211e1666e2..d8b2d0bec0d8 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -315,7 +315,6 @@ extern int proc_dowatchdog_thresh(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos); extern unsigned int softlockup_panic; -extern int softlockup_thresh; void lockup_detector_init(void); #else static inline void touch_softlockup_watchdog(void) |