Skip to contentSkip to conversation

ia64/sn: use msleep_interruptible() instead of

PATCH Applied Nishanth Aravamudan 1 participant 1 message Jul 9, 2005 Kernel janitors

lore
Share & tools
lore
#0 lore raw

PATCH 6/14 ia64/sn: use msleep_interruptible() instead of

From: Nishanth Aravamudan <[email protected]>

Description: Replace schedule_timeout() with msleep_interruptible() to guarantee the task delays as expected.

---

 xpc_main.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)
arch/ia64/sn/kernel/xpc_main.c +5 -10
diff -urp 2.6.13-rc2-kj/arch/ia64/sn/kernel/xpc_main.c 2.6.13-rc2-kj-dev/arch/ia64/sn/kernel/xpc_main.c
@@ -53,6 +53,7 @@
 #include <linux/cache.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
+#include <linux/delay.h>
 #include <asm/sn/intr.h>
 #include <asm/sn/sn_sal.h>
 #include <asm/uaccess.h>
@@ -308,8 +309,7 @@ xpc_make_first_contact(struct xpc_partit
 			"partition %d\n", XPC_PARTID(part));
 
 		/* wait a 1/4 of a second or so */
-		set_current_state(TASK_INTERRUPTIBLE);
-		(void) schedule_timeout(0.25 * HZ);
+		msleep_interruptible(250);
 
 		if (part->act_state == XPC_P_DEACTIVATING) {
 			return part->reason;
@@ -841,9 +841,7 @@ xpc_do_exit(void)
 	down(&xpc_discovery_exited);
 
 
-	set_current_state(TASK_INTERRUPTIBLE);
-	schedule_timeout(0.3 * HZ);
-	set_current_state(TASK_RUNNING);
+	msleep_interruptible(300);
 
 
 	/* wait for all partitions to become inactive */
@@ -860,11 +858,8 @@ xpc_do_exit(void)
 			}
 		}
 
-		if (active_part_count) {
-			set_current_state(TASK_INTERRUPTIBLE);
-			schedule_timeout(0.3 * HZ);
-			set_current_state(TASK_RUNNING);
-		}
+		if (active_part_count)
+			msleep_interruptible(300);
 
 	} while (active_part_count > 0);

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors