summaryrefslogtreecommitdiffstats
path: root/include/linux/nmi.h
diff options
context:
space:
mode:
authorMandeep Singh Baines <msb@chromium.org>2011-05-22 22:10:23 -0700
committerIngo Molnar <mingo@elte.hu>2011-05-23 11:58:59 +0200
commit4eec42f392043063d0f019640b4ccc2a45570002 (patch)
tree32db1c354f9c12d1275093efed8101a2bd5db232 /include/linux/nmi.h
parent586692a5a5fc5740c8a46abc0f2365495c2d7c5f (diff)
downloadlinux-stable-4eec42f392043063d0f019640b4ccc2a45570002.tar.gz
linux-stable-4eec42f392043063d0f019640b4ccc2a45570002.tar.bz2
linux-stable-4eec42f392043063d0f019640b4ccc2a45570002.zip
watchdog: Change the default timeout and configure nmi watchdog period based on watchdog_thresh
Before the conversion of the NMI watchdog to perf event, the watchdog timeout was 5 seconds. Now it is 60 seconds. For my particular application, netbooks, 5 seconds was a better timeout. With a short timeout, we catch faults earlier and are able to send back a panic. With a 60 second timeout, the user is unlikely to wait and will instead hit the power button, causing us to lose the panic info. This change configures the NMI period to watchdog_thresh and sets the softlockup_thresh to watchdog_thresh * 2. In addition, watchdog_thresh was reduced to 10 seconds as suggested by Ingo Molnar. 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-4-git-send-email-msb@chromium.org Signed-off-by: Ingo Molnar <mingo@elte.hu> LKML-Reference: <20110517071642.GF22305@elte.hu>
Diffstat (limited to 'include/linux/nmi.h')
-rw-r--r--include/linux/nmi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index 5317b8b2198f..2d304efc89df 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -45,7 +45,7 @@ static inline bool trigger_all_cpu_backtrace(void)
#ifdef CONFIG_LOCKUP_DETECTOR
int hw_nmi_is_cpu_stuck(struct pt_regs *);
-u64 hw_nmi_get_sample_period(void);
+u64 hw_nmi_get_sample_period(int watchdog_thresh);
extern int watchdog_enabled;
extern int watchdog_thresh;
struct ctl_table;