mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-11-01 23:18:21 +00:00
kernel: finish work of removing interruptible mutexes
This commit is contained in:
@@ -39,7 +39,7 @@ static int read(int minor, iovec_iterator_t *iovec_iterator, size_t size, uintma
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
MUTEX_ACQUIRE(&mutex, false);
|
||||
MUTEX_ACQUIRE(&mutex);
|
||||
|
||||
for (;;) {
|
||||
int revents = internalpoll(&desc.data[0], POLLIN);
|
||||
@@ -97,7 +97,7 @@ static int write(int minor, iovec_iterator_t *iovec_iterator, size_t size, uintm
|
||||
}
|
||||
|
||||
static int poll(int minor, polldata_t *data, int events) {
|
||||
MUTEX_ACQUIRE(&mutex, false);
|
||||
MUTEX_ACQUIRE(&mutex);
|
||||
int revents = internalpoll(data, events);
|
||||
MUTEX_RELEASE(&mutex);
|
||||
return revents;
|
||||
|
||||
@@ -457,11 +457,11 @@ void uacpi_kernel_free_mutex(uacpi_handle mut) {
|
||||
uacpi_status uacpi_kernel_acquire_mutex(
|
||||
uacpi_handle mut, uacpi_u16 timeout) {
|
||||
if (timeout == 0xFFFF) {
|
||||
MUTEX_ACQUIRE(mut, false);
|
||||
MUTEX_ACQUIRE(mut);
|
||||
return UACPI_STATUS_OK;
|
||||
}
|
||||
|
||||
bool didacquire = MUTEX_ACQUIRE_TIMED(mut, timeout * 1000, false);
|
||||
bool didacquire = MUTEX_ACQUIRE_TIMED(mut, timeout * 1000);
|
||||
return didacquire ? UACPI_STATUS_OK : UACPI_STATUS_TIMEOUT;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user