diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2013-05-19 20:45:15 +0200 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2013-06-20 15:41:18 +0200 |
| commit | 3c00ea82c724fab0b98f15428a804cb45eb9ad38 (patch) | |
| tree | 3e380db50cf9bc5d2962c25cc80707bfd9fc834c /include | |
| parent | b8900bc0217fac8e68085997bee2f05e6db931a2 (diff) | |
| download | linux-stable-3c00ea82c724fab0b98f15428a804cb45eb9ad38.tar.gz linux-stable-3c00ea82c724fab0b98f15428a804cb45eb9ad38.tar.bz2 linux-stable-3c00ea82c724fab0b98f15428a804cb45eb9ad38.zip | |
watchdog: Rename confusing state variable
We have two very conflicting state variable names in the
watchdog:
* watchdog_enabled: This one reflects the user interface. It's
set to 1 by default and can be overriden with boot options
or sysctl/procfs interface.
* watchdog_disabled: This is the internal toggle state that
tells if watchdog threads, timers and NMI events are currently
running or not. This state mostly depends on the user settings.
It's a convenient state latch.
Now we really need to find clearer names because those
are just too confusing to encourage deep review.
watchdog_enabled now becomes watchdog_user_enabled to reflect
its purpose as an interface.
watchdog_disabled becomes watchdog_running to suggest its
role as a pure internal state.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Cc: Anish Singh <anish198519851985@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Li Zhong <zhong@linux.vnet.ibm.com>
Cc: Don Zickus <dzickus@redhat.com>
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 db50840e6355..6a45fb583ff1 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 , |