summaryrefslogtreecommitdiff
path: root/kern/mutex/mutex_plain.c
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2018-07-10 19:40:05 +0200
committerRichard Braun <rbraun@sceen.net>2018-07-10 19:40:05 +0200
commit9ea1595a9156f2818b216d883e25f63bd74459c0 (patch)
treeaacf50829edcdce7a356c6bc8d629be82238e5fd /kern/mutex/mutex_plain.c
parent7cab594590002ff3737629b76083a298616b665a (diff)
kern/sleepq: make disabling interrupts optional
Commit d2a89f7f6e976d022527c2a5a1c75268aab8cd49 changed sleep queues to allow semaphores to be signalled from interrupt handlers, but this implied disabling interrupts for all synchronization objects, and most of them do not require interrupts to be disabled. The sleep queue interface is augmented with interrupt-related versions.
Diffstat (limited to 'kern/mutex/mutex_plain.c')
-rw-r--r--kern/mutex/mutex_plain.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/kern/mutex/mutex_plain.c b/kern/mutex/mutex_plain.c
index 55e7a251..bc49ca0b 100644
--- a/kern/mutex/mutex_plain.c
+++ b/kern/mutex/mutex_plain.c
@@ -76,12 +76,11 @@ mutex_plain_lock_slow_common(struct mutex *mutex, bool timed, uint64_t ticks)
{
unsigned int state;
struct sleepq *sleepq;
- unsigned long flags;
int error;
error = 0;
- sleepq = sleepq_lend(mutex, false, &flags);
+ sleepq = sleepq_lend(mutex, false);
for (;;) {
state = atomic_swap(&mutex->state, MUTEX_CONTENDED, ATOMIC_RELEASE);
@@ -121,7 +120,7 @@ mutex_plain_lock_slow_common(struct mutex *mutex, bool timed, uint64_t ticks)
}
out:
- sleepq_return(sleepq, flags);
+ sleepq_return(sleepq);
return error;
}
@@ -145,9 +144,8 @@ void
mutex_plain_unlock_slow(struct mutex *mutex)
{
struct sleepq *sleepq;
- unsigned long flags;
- sleepq = sleepq_acquire(mutex, false, &flags);
+ sleepq = sleepq_acquire(mutex, false);
if (sleepq == NULL) {
return;
@@ -155,7 +153,7 @@ mutex_plain_unlock_slow(struct mutex *mutex)
sleepq_signal(sleepq);
- sleepq_release(sleepq, flags);
+ sleepq_release(sleepq);
}
static int