From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755625Ab2LNJex (ORCPT ); Fri, 14 Dec 2012 04:34:53 -0500 Received: from canardo.mork.no ([148.122.252.1]:42748 "EHLO canardo.mork.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753991Ab2LNJew (ORCPT ); Fri, 14 Dec 2012 04:34:52 -0500 From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= To: linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Bj=C3=B8rn=20Mork?= , Norbert Warmuth , Joseph Salisbury , Thomas Gleixner Subject: [PATCH] Revert "watchdog: Fix CPU hotplug regression" Date: Fri, 14 Dec 2012 10:34:35 +0100 Message-Id: <1355477675-10552-1-git-send-email-bjorn@mork.no> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <87y5h1c70y.fsf@nemi.mork.no> References: <87y5h1c70y.fsf@nemi.mork.no> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: # v3.7 Cc: Norbert Warmuth Cc: Joseph Salisbury Cc: Thomas Gleixner Signed-off-by: Bjørn Mork --- 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