Messages in this thread | | | From | Norbert Warmuth <> | Subject | Re: [regression] 3.7+ suspend to RAM/offline CPU fails with nmi_watchdog=0 (bisected) | Date | Fri, 23 Nov 2012 14:11:09 +0100 |
| |
Thomas Gleixner writes: > 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?
Yes.
- Norbert
> 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 */
| |