watchdog: Fix print-once on enable
authorUlrich Obergfell <uobergfe@redhat.com>
Mon, 11 Aug 2014 14:49:25 +0000 (10:49 -0400)
committerIngo Molnar <mingo@kernel.org>
Mon, 18 Aug 2014 09:17:46 +0000 (11:17 +0200)
commitdf577149594cefacd62740e86de080c6336d699e
tree22dfb420cec7d57497ab875487e021bc5bd33794
parentf530504a063cfa028971e4b26ea8e0c32908de25
watchdog: Fix print-once on enable

This patch avoids printing the message 'enabled on all CPUs,
...' multiple times. For example, the issue can occur in the
following scenario:

1) watchdog_nmi_enable() fails to enable PMU counters and sets
   cpu0_err.

2) 'echo [0|1] > /proc/sys/kernel/nmi_watchdog' is executed to
   disable and re-enable the watchdog mechanism 'on the fly'.

3) If watchdog_nmi_enable() succeeds to enable PMU counters,
   each CPU will print the message because step1 left behind a
   non-zero cpu0_err.

   if (!IS_ERR(event)) {
       if (cpu == 0 || cpu0_err)
           pr_info("enabled on all CPUs, ...")

The patch avoids this by clearing cpu0_err in watchdog_nmi_disable().

Signed-off-by: Ulrich Obergfell <uobergfe@redhat.com>
Signed-off-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Don Zickus <dzickus@redhat.com>
Cc: pbonzini@redhat.com
Link: http://lkml.kernel.org/r/1407768567-171794-4-git-send-email-dzickus@redhat.com
[ Applied small cleanups. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/watchdog.c