]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[SPARC]: sbus/envctrl: replace schedule_timeout() with msleep_interruptible()
authorNishanth Aravamudan <nacc@us.ibm.com>
Mon, 25 Jul 2005 02:34:33 +0000 (19:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Jul 2005 02:34:33 +0000 (19:34 -0700)
Use msleep_interruptible() instead of schedule_timeout() to guarantee
the task delays as expected. Change the units of poll_interval to
msecs as it is only used in this delay.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/sbus/char/envctrl.c

index f6ed35b24f43167e689d836b2b3081421aecd84a..0c7cd7e7e2e512b25a536c2c23684406f934cd79 100644 (file)
@@ -1007,7 +1007,7 @@ static int kenvctrld(void *__unused)
                return -ENODEV;
        }
 
-       poll_interval = 5 * HZ; /* TODO env_mon_interval */
+       poll_interval = 5000; /* TODO env_mon_interval */
 
        daemonize("kenvctrld");
        allow_signal(SIGKILL);
@@ -1016,10 +1016,7 @@ static int kenvctrld(void *__unused)
 
        printk(KERN_INFO "envctrl: %s starting...\n", current->comm);
        for (;;) {
-               current->state = TASK_INTERRUPTIBLE;
-               schedule_timeout(poll_interval);
-
-               if(signal_pending(current))
+               if(msleep_interruptible(poll_interval))
                        break;
 
                for (whichcpu = 0; whichcpu < ENVCTRL_MAX_CPU; ++whichcpu) {