* [GIT pull] core regression fix for 3.7
@ 2012-12-06 12:17 Thomas Gleixner
0 siblings, 0 replies; only message in thread
From: Thomas Gleixner @ 2012-12-06 12:17 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Andrew Morton, Ingo Molnar, LKML
Linus,
please pull the latest core-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus
* Trivial CPU hotplug regression fix for the watchdog code.
Thanks,
tglx
------------------>
Thomas Gleixner (1):
watchdog: Fix CPU hotplug regression
kernel/watchdog.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index dd4b80a..c8c21be 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 */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-12-06 12:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-06 12:17 [GIT pull] core regression fix for 3.7 Thomas Gleixner
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®