diff options
| -rw-r--r-- | drivers/acpi/acpica/acglobal.h | 2 | ||||
| -rw-r--r-- | drivers/acpi/acpica/evmisc.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/acpica/utmutex.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h index 9bb69c59bb12..0e4dba0d0325 100644 --- a/drivers/acpi/acpica/acglobal.h +++ b/drivers/acpi/acpica/acglobal.h | |||
| @@ -228,8 +228,10 @@ ACPI_EXTERN u8 acpi_gbl_global_lock_present; | |||
| 228 | */ | 228 | */ |
| 229 | ACPI_EXTERN spinlock_t _acpi_gbl_gpe_lock; /* For GPE data structs and registers */ | 229 | ACPI_EXTERN spinlock_t _acpi_gbl_gpe_lock; /* For GPE data structs and registers */ |
| 230 | ACPI_EXTERN spinlock_t _acpi_gbl_hardware_lock; /* For ACPI H/W except GPE registers */ | 230 | ACPI_EXTERN spinlock_t _acpi_gbl_hardware_lock; /* For ACPI H/W except GPE registers */ |
| 231 | ACPI_EXTERN spinlock_t _acpi_ev_global_lock_pending_lock; /* For global lock */ | ||
| 231 | #define acpi_gbl_gpe_lock &_acpi_gbl_gpe_lock | 232 | #define acpi_gbl_gpe_lock &_acpi_gbl_gpe_lock |
| 232 | #define acpi_gbl_hardware_lock &_acpi_gbl_hardware_lock | 233 | #define acpi_gbl_hardware_lock &_acpi_gbl_hardware_lock |
| 234 | #define acpi_ev_global_lock_pending_lock &_acpi_ev_global_lock_pending_lock | ||
| 233 | 235 | ||
| 234 | /***************************************************************************** | 236 | /***************************************************************************** |
| 235 | * | 237 | * |
diff --git a/drivers/acpi/acpica/evmisc.c b/drivers/acpi/acpica/evmisc.c index 8e31bb5a973a..38bba66fcce5 100644 --- a/drivers/acpi/acpica/evmisc.c +++ b/drivers/acpi/acpica/evmisc.c | |||
| @@ -293,8 +293,6 @@ static void ACPI_SYSTEM_XFACE acpi_ev_notify_dispatch(void *context) | |||
| 293 | * | 293 | * |
| 294 | ******************************************************************************/ | 294 | ******************************************************************************/ |
| 295 | static u8 acpi_ev_global_lock_pending; | 295 | static u8 acpi_ev_global_lock_pending; |
| 296 | static spinlock_t _acpi_ev_global_lock_pending_lock; | ||
| 297 | #define acpi_ev_global_lock_pending_lock &_acpi_ev_global_lock_pending_lock | ||
| 298 | 296 | ||
| 299 | static u32 acpi_ev_global_lock_handler(void *context) | 297 | static u32 acpi_ev_global_lock_handler(void *context) |
| 300 | { | 298 | { |
diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c index d9efa495b433..199528ff7f1d 100644 --- a/drivers/acpi/acpica/utmutex.c +++ b/drivers/acpi/acpica/utmutex.c | |||
| @@ -85,6 +85,7 @@ acpi_status acpi_ut_mutex_initialize(void) | |||
| 85 | 85 | ||
| 86 | spin_lock_init(acpi_gbl_gpe_lock); | 86 | spin_lock_init(acpi_gbl_gpe_lock); |
| 87 | spin_lock_init(acpi_gbl_hardware_lock); | 87 | spin_lock_init(acpi_gbl_hardware_lock); |
| 88 | spin_lock_init(acpi_ev_global_lock_pending_lock); | ||
| 88 | 89 | ||
| 89 | /* Mutex for _OSI support */ | 90 | /* Mutex for _OSI support */ |
| 90 | status = acpi_os_create_mutex(&acpi_gbl_osi_mutex); | 91 | status = acpi_os_create_mutex(&acpi_gbl_osi_mutex); |
