This commit was generated by cvs2svn to compensate for changes in r172314,
which included commits to RCS files with non-trunk default branches.
This commit is contained in:
commit
26c31003af
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=172315
@ -567,6 +567,20 @@ AcpiEvAcquireGlobalLock (
|
||||
return_ACPI_STATUS (Status);
|
||||
}
|
||||
|
||||
/*
|
||||
* Update the global lock handle and check for wraparound. The handle is
|
||||
* only used for the external global lock interfaces, but it is updated
|
||||
* here to properly handle the case where a single thread may acquire the
|
||||
* lock via both the AML and the AcpiAcquireGlobalLock interfaces. The
|
||||
* handle is therefore updated on the first acquire from a given thread
|
||||
* regardless of where the acquisition request originated.
|
||||
*/
|
||||
AcpiGbl_GlobalLockHandle++;
|
||||
if (AcpiGbl_GlobalLockHandle == 0)
|
||||
{
|
||||
AcpiGbl_GlobalLockHandle = 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Make sure that a global lock actually exists. If not, just treat
|
||||
* the lock as a standard mutex.
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user