Merge pull request #451 from DrChat/mmio_deadlock_fix

Fix a rare deadlock in the MMIO handler
This commit is contained in:
Ben Vanik 2015-11-05 16:34:44 -08:00
commit a5eec3d2c5
1 changed files with 1 additions and 0 deletions

View File

@ -172,6 +172,7 @@ bool MMIOHandler::CheckWriteWatch(X64Context* thread_context,
if (cur_access != memory::PageAccess::kReadOnly && if (cur_access != memory::PageAccess::kReadOnly &&
cur_access != memory::PageAccess::kNoAccess) { cur_access != memory::PageAccess::kNoAccess) {
// Another thread has cleared this write watch. Abort. // Another thread has cleared this write watch. Abort.
global_critical_region_.mutex().unlock();
return true; return true;
} }