4 files changed, 11 insertions, 20 deletions

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index b3ad49fa7d78..ef430b1e8e42 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -1452,8 +1452,7 @@ static int proc_thread_write(struct file *file, const char __user *user_buffer,
                 thread_lock();
                 t->control |= T_REMDEV;
                 thread_unlock();
-                current->state = TASK_INTERRUPTIBLE;
-                schedule_timeout(HZ/8);  /* Propagate thread->control  */
+                schedule_timeout_interruptible(msecs_to_jiffies(125));  /* Propagate thread->control  */
                 ret = count;
                 sprintf(pg_result, "OK: rem_device_all");
                 goto out;
@@ -1716,10 +1715,9 @@ static void spin(struct pktgen_dev *pkt_dev, __u64 spin_until_us)
         printk(KERN_INFO "sleeping for %d\n", (int)(spin_until_us - now));
         while (now < spin_until_us) {
                 /* TODO: optimise sleeping behavior */
-                if (spin_until_us - now > (1000000/HZ)+1) {
-                        current->state = TASK_INTERRUPTIBLE;
-                        schedule_timeout(1);
-                } else if (spin_until_us - now > 100) {
+                if (spin_until_us - now > jiffies_to_usecs(1)+1)
+                        schedule_timeout_interruptible(1);
+                else if (spin_until_us - now > 100) {
                         do_softirq();
                         if (!pkt_dev->running)
                                 return;
@@ -2449,8 +2447,7 @@ static void pktgen_run_all_threads(void)
         }
         thread_unlock();
 
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(HZ/8);  /* Propagate thread->control  */
+        schedule_timeout_interruptible(msecs_to_jiffies(125));  /* Propagate thread->control  */
                         
         pktgen_wait_all_threads_run();
 }
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 953129d392d2..e8674baaa8d9 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -1103,10 +1103,8 @@ static int __init ic_dynamic(void)
 #endif
 
                 jiff = jiffies + (d->next ? CONF_INTER_TIMEOUT : timeout);
-                while (time_before(jiffies, jiff) && !ic_got_reply) {
-                        set_current_state(TASK_UNINTERRUPTIBLE);
-                        schedule_timeout(1);
-                }
+                while (time_before(jiffies, jiff) && !ic_got_reply)
+                        schedule_timeout_uninterruptible(1);
 #ifdef IPCONFIG_DHCP
                 /* DHCP isn't done until we get a DHCPACK. */
                 if ((ic_got_reply & IC_BOOTP)
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index 5d1e61168eb7..6f20b4206e08 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -567,10 +567,8 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
         self->tty = NULL;
 
         if (self->blocked_open) {
-                if (self->close_delay) {
-                        current->state = TASK_INTERRUPTIBLE;
-                        schedule_timeout(self->close_delay);
-                }
+                if (self->close_delay)
+                        schedule_timeout_interruptible(self->close_delay);
                 wake_up_interruptible(&self->open_wait);
         }
 
@@ -863,8 +861,7 @@ static void ircomm_tty_wait_until_sent(struct tty_struct *tty, int timeout)
         spin_lock_irqsave(&self->spinlock, flags);
         while (self->tx_skb && self->tx_skb->len) {
                 spin_unlock_irqrestore(&self->spinlock, flags);
-                current->state = TASK_INTERRUPTIBLE;
-                schedule_timeout(poll_time);
+                schedule_timeout_interruptible(poll_time);
                 spin_lock_irqsave(&self->spinlock, flags);
                 if (signal_pending(current))
                         break;
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 05fe2e735538..51885b5f744e 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1170,8 +1170,7 @@ svc_recv(struct svc_serv *serv, struct svc_rqst *rqstp, long timeout)
         while (rqstp->rq_arghi < pages) {
                 struct page *p = alloc_page(GFP_KERNEL);
                 if (!p) {
-                        set_current_state(TASK_UNINTERRUPTIBLE);
-                        schedule_timeout(HZ/2);
+                        schedule_timeout_uninterruptible(msecs_to_jiffies(500));
                         continue;
                 }
                 rqstp->rq_argpages[rqstp->rq_arghi++] = p;