diff options
author | Bob Moore <robert.moore@intel.com> | 2011-11-27 20:43:52 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2012-01-17 03:36:25 -0500 |
commit | 42f5284306465dc263ce227b0c5bd2c7dcd43cdf (patch) | |
tree | 7eb2f24783f4e12f52d84a9cb744a4f1f434d84c /drivers/acpi/acpica | |
parent | 3298758385bbffa792f009fd965e02203aaf82a2 (diff) |
ACPICA: Update for GCC 4
Fixes several issues with GCC 4.6 related to the new checks for
unused variables.
http://www.acpica.org/bugzilla/show_bug.cgi?id=935
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/acpica')
-rw-r--r-- | drivers/acpi/acpica/utmutex.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c index 7d797e2baecd..302c74e26f95 100644 --- a/drivers/acpi/acpica/utmutex.c +++ b/drivers/acpi/acpica/utmutex.c | |||
@@ -293,14 +293,10 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id) | |||
293 | 293 | ||
294 | acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id) | 294 | acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id) |
295 | { | 295 | { |
296 | acpi_thread_id this_thread_id; | ||
297 | |||
298 | ACPI_FUNCTION_NAME(ut_release_mutex); | 296 | ACPI_FUNCTION_NAME(ut_release_mutex); |
299 | 297 | ||
300 | this_thread_id = acpi_os_get_thread_id(); | ||
301 | |||
302 | ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Thread %u releasing Mutex [%s]\n", | 298 | ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Thread %u releasing Mutex [%s]\n", |
303 | (u32)this_thread_id, | 299 | (u32)acpi_os_get_thread_id(), |
304 | acpi_ut_get_mutex_name(mutex_id))); | 300 | acpi_ut_get_mutex_name(mutex_id))); |
305 | 301 | ||
306 | if (mutex_id > ACPI_MAX_MUTEX) { | 302 | if (mutex_id > ACPI_MAX_MUTEX) { |
@@ -329,7 +325,8 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id) | |||
329 | * the ACPI subsystem code. | 325 | * the ACPI subsystem code. |
330 | */ | 326 | */ |
331 | for (i = mutex_id; i < ACPI_NUM_MUTEX; i++) { | 327 | for (i = mutex_id; i < ACPI_NUM_MUTEX; i++) { |
332 | if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) { | 328 | if (acpi_gbl_mutex_info[i].thread_id == |
329 | acpi_os_get_thread_id()) { | ||
333 | if (i == mutex_id) { | 330 | if (i == mutex_id) { |
334 | continue; | 331 | continue; |
335 | } | 332 | } |