Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a1fe2f2 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds
Browse files

ACPI / ACPICA: Initialize the global lock spinlock as appropriate 



Commit 9cd03144 (ACPI / ACPICA: Fix global lock acquisition) forgot to
initialize the spinlock it added.  Fix that.

Reported-and-tested-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Tested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6ab82196

drivers/acpi/acpica/acglobal.h

+2 −0
Original line number Diff line number Diff line
@@ -228,8 +228,10 @@ ACPI_EXTERN u8 acpi_gbl_global_lock_present; 
 */

ACPI_EXTERN spinlock_t _acpi_gbl_gpe_lock;	/* For GPE data structs and registers */

ACPI_EXTERN spinlock_t _acpi_gbl_hardware_lock;	/* For ACPI H/W except GPE registers */

ACPI_EXTERN spinlock_t _acpi_ev_global_lock_pending_lock; /* For global lock */

#define acpi_gbl_gpe_lock	&_acpi_gbl_gpe_lock

#define acpi_gbl_hardware_lock	&_acpi_gbl_hardware_lock

#define acpi_ev_global_lock_pending_lock &_acpi_ev_global_lock_pending_lock



/*****************************************************************************

 *

drivers/acpi/acpica/evmisc.c

+0 −2
Original line number Diff line number Diff line
@@ -293,8 +293,6 @@ static void ACPI_SYSTEM_XFACE acpi_ev_notify_dispatch(void *context) 
 *

 ******************************************************************************/

static u8 acpi_ev_global_lock_pending;

static spinlock_t _acpi_ev_global_lock_pending_lock;

#define acpi_ev_global_lock_pending_lock &_acpi_ev_global_lock_pending_lock



static u32 acpi_ev_global_lock_handler(void *context)

{

drivers/acpi/acpica/utmutex.c

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ acpi_status acpi_ut_mutex_initialize(void) 


	spin_lock_init(acpi_gbl_gpe_lock);

	spin_lock_init(acpi_gbl_hardware_lock);

	spin_lock_init(acpi_ev_global_lock_pending_lock);



	/* Mutex for _OSI support */

	status = acpi_os_create_mutex(&acpi_gbl_osi_mutex);