diff options
| author | Bob Moore <robert.moore@intel.com> | 2017-11-17 18:42:27 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-26 19:20:32 -0500 |
| commit | 692aa0cf5d459dfb747d8bbf8bee20afbf1fa746 (patch) | |
| tree | 40eb7eae9a8515e7d6446a02e0715d22f2a19da5 | |
| parent | 060c859d79ed8ead423a076e581af08d6496bf02 (diff) | |
ACPICA: Update mutex error messages, no functional change
ACPICA commit 22f2b0beb45d277841ed02bc613df1009e5b20cf
Add mutex name on certain acquire/release errors.
Link: https://github.com/acpica/acpica/commit/22f2b0be
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | drivers/acpi/acpica/utmutex.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c index 586354788018..524ba931d5e8 100644 --- a/drivers/acpi/acpica/utmutex.c +++ b/drivers/acpi/acpica/utmutex.c | |||
| @@ -286,8 +286,9 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id) | |||
| 286 | acpi_gbl_mutex_info[mutex_id].thread_id = this_thread_id; | 286 | acpi_gbl_mutex_info[mutex_id].thread_id = this_thread_id; |
| 287 | } else { | 287 | } else { |
| 288 | ACPI_EXCEPTION((AE_INFO, status, | 288 | ACPI_EXCEPTION((AE_INFO, status, |
| 289 | "Thread %u could not acquire Mutex [0x%X]", | 289 | "Thread %u could not acquire Mutex [%s] (0x%X)", |
| 290 | (u32)this_thread_id, mutex_id)); | 290 | (u32)this_thread_id, |
| 291 | acpi_ut_get_mutex_name(mutex_id), mutex_id)); | ||
| 291 | } | 292 | } |
| 292 | 293 | ||
| 293 | return (status); | 294 | return (status); |
| @@ -322,8 +323,8 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id) | |||
| 322 | */ | 323 | */ |
| 323 | if (acpi_gbl_mutex_info[mutex_id].thread_id == ACPI_MUTEX_NOT_ACQUIRED) { | 324 | if (acpi_gbl_mutex_info[mutex_id].thread_id == ACPI_MUTEX_NOT_ACQUIRED) { |
| 324 | ACPI_ERROR((AE_INFO, | 325 | ACPI_ERROR((AE_INFO, |
| 325 | "Mutex [0x%X] is not acquired, cannot release", | 326 | "Mutex [%s] (0x%X) is not acquired, cannot release", |
| 326 | mutex_id)); | 327 | acpi_ut_get_mutex_name(mutex_id), mutex_id)); |
| 327 | 328 | ||
| 328 | return (AE_NOT_ACQUIRED); | 329 | return (AE_NOT_ACQUIRED); |
| 329 | } | 330 | } |
