From 843fcaca6794368a7ca82696dc0cfa21f52223e1 Mon Sep 17 00:00:00 2001
From: Dmitry Adamushko <dmitry.adamushko@gmail.com>
Date: Fri, 8 Feb 2008 15:41:13 +0100
Subject: [PATCH] --- yaml --- r: 86602 b: refs/heads/master c:
 7be2a03e3174cee3a3cdcdf17db357470f51caff h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/kernel/softlockup.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 6592fb16c44c..284f1c50cf2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2232c2d8e0a6a31061dec311f3d1cf7624bc14f1
+refs/heads/master: 7be2a03e3174cee3a3cdcdf17db357470f51caff
diff --git a/trunk/kernel/softlockup.c b/trunk/kernel/softlockup.c
index 7c2da88db4ed..01b6522fd92b 100644
--- a/trunk/kernel/softlockup.c
+++ b/trunk/kernel/softlockup.c
@@ -216,26 +216,27 @@ static int watchdog(void *__bind_cpu)
 	/* initialize timestamp */
 	touch_softlockup_watchdog();
 
+	set_current_state(TASK_INTERRUPTIBLE);
 	/*
 	 * Run briefly once per second to reset the softlockup timestamp.
 	 * If this gets delayed for more than 60 seconds then the
 	 * debug-printout triggers in softlockup_tick().
 	 */
 	while (!kthread_should_stop()) {
-		set_current_state(TASK_INTERRUPTIBLE);
 		touch_softlockup_watchdog();
 		schedule();
 
 		if (kthread_should_stop())
 			break;
 
-		if (this_cpu != check_cpu)
-			continue;
-
-		if (sysctl_hung_task_timeout_secs)
-			check_hung_uninterruptible_tasks(this_cpu);
+		if (this_cpu == check_cpu) {
+			if (sysctl_hung_task_timeout_secs)
+				check_hung_uninterruptible_tasks(this_cpu);
+		}
 
+		set_current_state(TASK_INTERRUPTIBLE);
 	}
+	__set_current_state(TASK_RUNNING);
 
 	return 0;
 }