diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-24 20:38:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-24 20:38:44 -0700 |
| commit | e89227889cec6b66758b44c83f78dba337e5d699 (patch) | |
| tree | 44fbf495ca2d0827e44bcc449a0f5177228dbdd8 /drivers/sbus/char/envctrl.c | |
| parent | 4e8fd22bd421d7aa279bcb76189505a1f96bb7bf (diff) | |
| parent | db7d9a4eb700be766cc9f29241483dbb1e748832 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers/sbus/char/envctrl.c')
| -rw-r--r-- | drivers/sbus/char/envctrl.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c index f6ed35b24f43..9a8c572554f5 100644 --- a/drivers/sbus/char/envctrl.c +++ b/drivers/sbus/char/envctrl.c @@ -19,6 +19,8 @@ * Daniele Bellucci <bellucda@tiscali.it> */ +#define __KERNEL_SYSCALLS__ + #include <linux/config.h> #include <linux/module.h> #include <linux/sched.h> @@ -35,7 +37,6 @@ #include <asm/uaccess.h> #include <asm/envctrl.h> -#define __KERNEL_SYSCALLS__ static int errno; #include <asm/unistd.h> @@ -1007,7 +1008,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 +1017,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) { |