From 7ed9649cd1ff110a3def6aa4394206b7751823f1 Mon Sep 17 00:00:00 2001 From: Bob Moore Date: Mon, 28 Nov 2011 09:43:52 +0800 Subject: [PATCH] --- yaml --- r: 286453 b: refs/heads/master c: 42f5284306465dc263ce227b0c5bd2c7dcd43cdf h: refs/heads/master i: 286451: 2218f2242ccd2ddc96e966eadffebb60e53d2135 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/acpica/utmutex.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 68b5ac161a8f..463fe0cb3771 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3298758385bbffa792f009fd965e02203aaf82a2 +refs/heads/master: 42f5284306465dc263ce227b0c5bd2c7dcd43cdf diff --git a/trunk/drivers/acpi/acpica/utmutex.c b/trunk/drivers/acpi/acpica/utmutex.c index 7d797e2baecd..302c74e26f95 100644 --- a/trunk/drivers/acpi/acpica/utmutex.c +++ b/trunk/drivers/acpi/acpica/utmutex.c @@ -293,14 +293,10 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id) acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id) { - acpi_thread_id this_thread_id; - ACPI_FUNCTION_NAME(ut_release_mutex); - this_thread_id = acpi_os_get_thread_id(); - ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Thread %u releasing Mutex [%s]\n", - (u32)this_thread_id, + (u32)acpi_os_get_thread_id(), acpi_ut_get_mutex_name(mutex_id))); if (mutex_id > ACPI_MAX_MUTEX) { @@ -329,7 +325,8 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id) * the ACPI subsystem code. */ for (i = mutex_id; i < ACPI_NUM_MUTEX; i++) { - if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) { + if (acpi_gbl_mutex_info[i].thread_id == + acpi_os_get_thread_id()) { if (i == mutex_id) { continue; }