Merge pull request #2396 from Subv/sema_acquire

Kernel/Semaphore: Fixed a regression in semaphore waits.
This commit is contained in:
bunnei 2017-01-06 22:00:12 -05:00 committed by GitHub
commit 59f4f1d7ff

View file

@ -35,7 +35,8 @@ bool Semaphore::ShouldWait(Thread* thread) const {
} }
void Semaphore::Acquire(Thread* thread) { void Semaphore::Acquire(Thread* thread) {
ASSERT_MSG(!ShouldWait(thread), "object unavailable!"); if (available_count <= 0)
return;
--available_count; --available_count;
} }