Fix global lock recursion bug.

This patch was part of ACPI-CA 20070508 release and the
following is excerpt from its change log:

Fixed a problem where the Global Lock handle was not properly
updated if a thread that acquired the Global Lock via executing
AML code then attempted to acquire the lock via the
AcpiAcquireGlobalLock interface. Reported by Joe Liu.

Approved by:	re (kensmith)
Tested by:	ambrisko
Obtained from:	Intel

1 files changed, 1 insertions, 10 deletions

diff --git a/sys/contrib/dev/acpica/evxface.c b/sys/contrib/dev/acpica/evxface.c
index 021ebf7f88e6..15fbc9c65047 100644
--- a/sys/contrib/dev/acpica/evxface.c
+++ b/sys/contrib/dev/acpica/evxface.c
@@ -921,16 +921,7 @@ AcpiAcquireGlobalLock (
 
     if (ACPI_SUCCESS (Status))
     {
-        /*
-         * If this was the first acquisition of the Global Lock by this thread,
-         * create a new handle. Otherwise, return the existing handle.
-         */
-        if (AcpiGbl_GlobalLockMutex->Mutex.AcquisitionDepth == 1)
-        {
-            AcpiGbl_GlobalLockHandle++;
-        }
-
-        /* Return the global lock handle */
+        /* Return the global lock handle (updated in AcpiEvAcquireGlobalLock) */
 
         *Handle = AcpiGbl_GlobalLockHandle;
     }