On Mon, May 20, 2013 at 06:01:56PM +0200, Frederic Weisbecker wrote:
> When the watchdog is disabled through the 'nmi_watchdog=0'
> boot parameter, the watchdog_running internal state isn't
> cleared. Hence further enablements through sysctl/procfs
> are ignored because the subsystem spuriously thinks it's
> already running.
>
> Initialize it properly on boot.
Looks fine to me. Can't think of a case where this breaks something.
Acked-by: Don Zickus <dzic...@redhat.com>
>
> Signed-off-by: Frederic Weisbecker <fweis...@gmail.com>
> Cc: Don Zickus <dzic...@redhat.com>
> Cc: Ingo Molnar <mi...@kernel.org>
> Cc: Peter Zijlstra <pet...@infradead.org>
> ---
> kernel/watchdog.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/watchdog.c b/kernel/watchdog.c
> index 10776fe..3fa5df20 100644
> --- a/kernel/watchdog.c
> +++ b/kernel/watchdog.c
> @@ -31,7 +31,7 @@
>
> int watchdog_user_enabled = 1;
> int __read_mostly watchdog_thresh = 10;
> -static int __read_mostly watchdog_running = 1;
> +static int __read_mostly watchdog_running;
> static u64 __read_mostly sample_period;
>
> static DEFINE_PER_CPU(unsigned long, watchdog_touch_ts);
> @@ -545,10 +545,10 @@ void __init lockup_detector_init(void)
> {
> #ifdef CONFIG_NO_HZ_FULL
> watchdog_user_enabled = 0;
> - watchdog_running = 0;
> pr_warning("Disabled lockup detectors by default because of full
> dynticks\n");
> pr_warning("You can overwrite that with 'sysctl -w
> kernel.watchdog=1'\n");
> #endif
> + watchdog_running = watchdog_user_enabled;
> set_sample_period();
> if (smpboot_register_percpu_thread(&watchdog_threads)) {
> pr_err("Failed to create watchdog threads, disabled\n");
> --
> 1.7.5.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
