This reverts commit 8d4516904b39507458bee8115793528e12b1d8dd.
commit 8d451690 ("watchdog: Fix CPU hotplug regression") cause
a hard lockup when I connect AC power on my laptop. The indirect
reason is that laptop-mode-tools is configured to do
echo 0 > /proc/sys/kernel/nmi_watchdog
when AC power is disconnected and
echo 1 > /proc/sys/kernel/nmi_watchdog
when AC power is connected. This is the default configuration of
the Debian laptop-mode-tools package.
Cc: <sta...@vger.kernel.org> # v3.7
Cc: Norbert Warmuth <nwarm...@t-online.de>
Cc: Joseph Salisbury <joseph.salisb...@canonical.com>
Cc: Thomas Gleixner <t...@linutronix.de>
Signed-off-by: Bjørn Mork <bj...@mork.no>
---
kernel/watchdog.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index c8c21be..dd4b80a 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -368,9 +368,6 @@ static void watchdog_disable(unsigned int cpu)
{
struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer);
- if (!watchdog_enabled)
- return;
-
watchdog_set_prio(SCHED_NORMAL, 0);
hrtimer_cancel(hrtimer);
/* disable the perf event */
--
1.7.2.5
--
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/
