summaryrefslogtreecommitdiff
path: root/kern/semaphore.c
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2017-03-17 21:49:22 +0100
committerRichard Braun <rbraun@sceen.net>2017-03-17 21:49:22 +0100
commitd2a89f7f6e976d022527c2a5a1c75268aab8cd49 (patch)
tree9a8399ba70a8f4fa9f6a50b5f15ec5f37749882e /kern/semaphore.c
parentd28cd672a56342e4dcdbb51fe63a13e61eeefdd4 (diff)
kern/sleepq: also disable interrupts during critical sections
Diffstat (limited to 'kern/semaphore.c')
-rw-r--r--kern/semaphore.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/kern/semaphore.c b/kern/semaphore.c
index e41e2c2f..7e94dafd 100644
--- a/kern/semaphore.c
+++ b/kern/semaphore.c
@@ -26,9 +26,10 @@ void
semaphore_wait_slow(struct semaphore *semaphore)
{
struct sleepq *sleepq;
+ unsigned long flags;
unsigned int prev;
- sleepq = sleepq_lend(semaphore, false);
+ sleepq = sleepq_lend(semaphore, false, &flags);
for (;;) {
prev = semaphore_dec(semaphore);
@@ -40,15 +41,16 @@ semaphore_wait_slow(struct semaphore *semaphore)
sleepq_wait(sleepq, "sem");
}
- sleepq_return(sleepq);
+ sleepq_return(sleepq, flags);
}
void
semaphore_post_slow(struct semaphore *semaphore)
{
struct sleepq *sleepq;
+ unsigned long flags;
- sleepq = sleepq_acquire(semaphore, false);
+ sleepq = sleepq_acquire(semaphore, false, &flags);
if (sleepq == NULL) {
return;
@@ -56,5 +58,5 @@ semaphore_post_slow(struct semaphore *semaphore)
sleepq_signal(sleepq);
- sleepq_release(sleepq);
+ sleepq_release(sleepq, flags);
}