git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
sbus
/
char
/
bbc_envctrl.c
diff --git
a/drivers/sbus/char/bbc_envctrl.c
b/drivers/sbus/char/bbc_envctrl.c
index
37189ef
..
f028b15
100644
(file)
--- a/
drivers/sbus/char/bbc_envctrl.c
+++ b/
drivers/sbus/char/bbc_envctrl.c
@@
-7,7
+7,6
@@
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/slab.h>
-#include <linux/delay.h>
#include <asm/oplib.h>
#include <asm/ebus.h>
#define __KERNEL_SYSCALLS__
#include <asm/oplib.h>
#include <asm/ebus.h>
#define __KERNEL_SYSCALLS__
@@
-623,7
+622,9
@@
void bbc_envctrl_cleanup(void)
read_unlock(&tasklist_lock);
if (!found)
break;
read_unlock(&tasklist_lock);
if (!found)
break;
- msleep(1000);
+ current->state = TASK_INTERRUPTIBLE;
+ schedule_timeout(HZ);
+ current->state = TASK_RUNNING;
}
kenvctrld_task = NULL;
}
}
kenvctrld_task = NULL;
}