aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorBjoern B. Brandenburg <bbb@cs.unc.edu>2007-09-23 23:34:23 -0400
committerBjoern B. Brandenburg <bbb@cs.unc.edu>2007-09-23 23:34:23 -0400
commitd155d1811e2ea2b8ae69af6b613d0e998619c4df (patch)
treead72c9e8a38bd45d1c816dc0f450ca6bd6264221 /kernel
parentfe3d328b92874a8134be3bd22d187cbb50b333b8 (diff)
Use preempt_enable_no_resched() before calling schedule() anyway.
Diffstat (limited to 'kernel')
-rw-r--r--kernel/litmus_sem.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/litmus_sem.c b/kernel/litmus_sem.c
index 4eafc13879..12a6ab1f91 100644
--- a/kernel/litmus_sem.c
+++ b/kernel/litmus_sem.c
@@ -82,7 +82,7 @@ static fastcall void rt_fifo_down(struct semaphore * sem)
82 spin_unlock(&sem->wait.lock); 82 spin_unlock(&sem->wait.lock);
83 83
84 TS_FIFO_DOWN_END; 84 TS_FIFO_DOWN_END;
85 preempt_enable(); 85 preempt_enable_no_resched();
86 86
87 /* we depend on the FIFO order 87 /* we depend on the FIFO order
88 * Thus, we don't need to recheck when we wake up, we 88 * Thus, we don't need to recheck when we wake up, we
@@ -352,7 +352,7 @@ asmlinkage long sys_pi_down(pi_sema_id sem_id)
352 spin_unlock_irqrestore(&sem->wait.lock, flags); 352 spin_unlock_irqrestore(&sem->wait.lock, flags);
353 353
354 TS_PI_DOWN_END; 354 TS_PI_DOWN_END;
355 preempt_enable(); 355 preempt_enable_no_resched();
356 356
357 357
358 /* we depend on the FIFO order 358 /* we depend on the FIFO order
@@ -719,7 +719,7 @@ void srp_ceiling_block(void)
719 tsk->state = TASK_UNINTERRUPTIBLE; 719 tsk->state = TASK_UNINTERRUPTIBLE;
720 add_wait_queue(&__get_cpu_var(srp).ceiling_blocked, &wait); 720 add_wait_queue(&__get_cpu_var(srp).ceiling_blocked, &wait);
721 TRACE_CUR("is priority ceiling blocked.\n"); 721 TRACE_CUR("is priority ceiling blocked.\n");
722 preempt_enable(); 722 preempt_enable_no_resched();
723 schedule(); 723 schedule();
724 /* Access to CPU var must occur with preemptions disabled, otherwise 724 /* Access to CPU var must occur with preemptions disabled, otherwise
725 * Linux debug code complains loudly, even if it is ok here. 725 * Linux debug code complains loudly, even if it is ok here.