[src/netbsd-2-0]: src/sys/dev/acpi/acpica/Subsystem Pullup rev 1.13 (requeste...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ff030988ca54
branches:  netbsd-2-0
changeset: 560577:ff030988ca54
user:      jmc <jmc%NetBSD.org@localhost>
date:      Wed Apr 28 05:22:59 2004 +0000

description:
Pullup rev 1.13 (requested by kochi in ticket #190)

A bugfix for Mutex handling.

diffstat:

 sys/dev/acpi/acpica/Subsystem/exmutex.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 4ed4eab19e1b -r ff030988ca54 sys/dev/acpi/acpica/Subsystem/exmutex.c
--- a/sys/dev/acpi/acpica/Subsystem/exmutex.c   Wed Apr 28 05:22:54 2004 +0000
+++ b/sys/dev/acpi/acpica/Subsystem/exmutex.c   Wed Apr 28 05:22:59 2004 +0000
@@ -116,7 +116,7 @@
  *****************************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exmutex.c,v 1.12 2004/02/14 16:57:24 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exmutex.c,v 1.12.2.1 2004/04/28 05:22:59 jmc Exp $");
 
 #define __EXMUTEX_C__
 
@@ -288,6 +288,7 @@
     ObjDesc->Mutex.OwnerThread      = WalkState->Thread;
     ObjDesc->Mutex.AcquisitionDepth = 1;
 
+    ObjDesc->Mutex.PreviousSyncLevel = WalkState->Thread->CurrentSyncLevel;
     WalkState->Thread->CurrentSyncLevel = ObjDesc->Mutex.SyncLevel;
 
     /* Link the mutex to the current thread for force-unlock at method exit */
@@ -389,7 +390,7 @@
     /* Update the mutex and walk state */
 
     ObjDesc->Mutex.OwnerThread = NULL;
-    WalkState->Thread->CurrentSyncLevel = ObjDesc->Mutex.SyncLevel;
+    WalkState->Thread->CurrentSyncLevel = ObjDesc->Mutex.PreviousSyncLevel;
 
     return_ACPI_STATUS (Status);
 }