2 files changed, 5 insertions, 12 deletions

diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c
index c1cbcd1a139..254fe15c064 100644
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
@@ -8,7 +8,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/proc_fs.h>
diff --git a/arch/ia64/sn/kernel/xpc_main.c b/arch/ia64/sn/kernel/xpc_main.c
index 177ddb748eb..d580adcad92 100644
--- a/arch/ia64/sn/kernel/xpc_main.c
+++ b/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_partition *part)
                         "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,12 +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);