voron

commit 6443fb79dc04843ae686429d8d76080ae1a3fc1f
parent 1317589dcb0098cc27b7bbbbc5e6ffbe74cffcf1
Author: oblique <psyberbits@gmail.com>
Date:   Mon,  5 Nov 2012 17:57:05 +0200

disable irqs before we change the state of 'current'

Diffstat:
M
kernel/sched.c
 | 
9
++++++---

1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/kernel/sched.c b/kernel/sched.c
@@ -190,10 +190,11 @@ sched(struct regs *regs)
 void
 suspend_task(u32 channel)
 {
+	irq_disable();
 	current->sleep_chan = channel;
 	current->sleep_reason = SLEEPR_SUSPEND;
-	dmb();
 	current->state = TASK_SLEEPING;
+	irq_enable();
 	schedule();
 }
 
@@ -220,10 +221,11 @@ resume_tasks(u32 channel)
 void
 sleep(u32 seconds)
 {
+	irq_disable();
 	current->wakeup_ms = uatomic_read(&ms_counter) + seconds * 1000;
 	current->sleep_reason = SLEEPR_SLEEP;
-	dmb();
 	current->state = TASK_SLEEPING;
+	irq_enable();
 	/* force schedule */
 	schedule();
 }
@@ -231,14 +233,15 @@ sleep(u32 seconds)
 void
 msleep(u32 milliseconds)
 {
+	irq_disable();
 	/* TODO: if ms is smaller than SCHED_INT_MS
 	 * do a loop and don't schedule */
 	if (milliseconds < SCHED_INT_MS)
 		milliseconds = SCHED_INT_MS;
 	current->wakeup_ms = uatomic_read(&ms_counter) + milliseconds;
 	current->sleep_reason = SLEEPR_SLEEP;
-	dmb();
 	current->state = TASK_SLEEPING;
+	irq_enable();
 	/* force schedule */
 	schedule();
 }