mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: Norbert Warmuth <nwarmuth@t-online.de>
Cc: linux-kernel@vger.kernel.org
Subject: Re: [regression] 3.7+ suspend to RAM/offline CPU fails with nmi_watchdog=0 (bisected)
Date: Fri, 23 Nov 2012 10:33:54 +0100 (CET)	[thread overview]
Message-ID: <alpine.LFD.2.02.1211231033230.2701@ionos> (raw)
In-Reply-To: <86sj83pbwy.fsf@belegost.ivcecceob.t-online.de>

On Wed, 21 Nov 2012, Norbert Warmuth wrote:
> 3.7-rc6 booted with nmi_watchdog=0 fails to suspend to RAM or
> offline CPUs. It's reproducable with a KVM guest and physical
> system. 

Does the patch below fix it?

Thanks,

	tglx

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 9d4c8d5..e3ef521 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -368,6 +368,9 @@ 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 */

  reply	other threads:[~2012-11-23  9:33 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-21  9:01 Norbert Warmuth
2012-11-23  9:33 ` Thomas Gleixner [this message]
2012-11-23 13:11   ` Norbert Warmuth
2012-11-28 16:56     ` Joseph Salisbury
2012-11-28 20:37       ` Thomas Gleixner
2012-12-04 19:10   ` [tip:core/urgent] watchdog: Fix CPU hotplug regression tip-bot for Thomas Gleixner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.LFD.2.02.1211231033230.2701@ionos \
    --to=tglx@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nwarmuth@t-online.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®