Reschedule after acquiring a lock.

This matches the actual test results.
Stonepop · Nov 20, 2012 · a539580 · a539580
1 parent 2613ed8
commit a539580
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Core/HLE/sceKernelMutex.cpp b/Core/HLE/sceKernelMutex.cpp
@@ -125,7 +125,9 @@ void sceKernelLockMutex(SceUID id, int count, u32 timeoutPtr)
 	{
 		mutex->nm.lockLevel += count;
 		mutex->nm.lockThread = __KernelGetCurThread();
-		// Nobody had it locked - no need to block
+
+		// Needed to get the proper order per real PSP.
+		__KernelReSchedule("mutex locked");
 	}
 	else if ((mutex->nm.attr & PSP_MUTEX_ATTR_ALLOW_RECURSIVE) && mutex->nm.lockThread == __KernelGetCurThread())
 	{

diff --git a/test.py b/test.py
@@ -31,6 +31,7 @@
   "string/string",
   "gpu/callbacks/ge_callbacks",
   "threads/mbx/mbx",
+  "threads/mutex/mutex",
   "threads/semaphores/semaphores",
   "threads/semaphores/cancel/cancel",
   "threads/semaphores/create/create",
@@ -49,7 +50,6 @@
 # These are the next tests up for fixing. These run by default.
   "threads/fpl/fpl",
   "threads/msgpipe/msgpipe",
-  "threads/mutex/mutex",
   "threads/scheduling/scheduling",
   "threads/semaphores/priority/priority",
   "threads/semaphores/wait/wait",