diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-07-10 08:43:25 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-07-10 08:43:25 (GMT) |
| commit | e399eb56a6110e13f97e644658648602e2b08de7 (patch) | |
| tree | edcd90e3134a5409339794f43d5dd4453cd72586 /include | |
| parent | 7c6809ff2bd63d4c97ce9e0b94d39d5180842c48 (diff) | |
| parent | 5b8621a68fdcd2baf1d3b413726f913a5254d46a (diff) | |
| download | linux-e399eb56a6110e13f97e644658648602e2b08de7.tar.xz | |
Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/urgent
Pull nohz updates/fixes from Frederic Weisbecker:
' Note that "watchdog: Boot-disable by default on full dynticks" is a temporary
solution to solve the issue with the watchdog that prevents the tick from
stopping. This is to make sure that 3.11 doesn't have that problem as several
people complained about it.
A proper and longer term solution has been proposed by Peterz:
http://lkml.kernel.org/r/20130618103632.GO3204@twins.programming.kicks-ass.net
'
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nmi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nmi.h b/include/linux/nmi.h index db50840..6a45fb5 100644 --- a/include/linux/nmi.h +++ b/include/linux/nmi.h @@ -46,7 +46,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(int watchdog_thresh); -extern int watchdog_enabled; +extern int watchdog_user_enabled; extern int watchdog_thresh; struct ctl_table; extern int proc_dowatchdog(struct ctl_table *, int , |