acpi: fix 64-bit pointer truncation bugs
PATCH 1/1 acpi: fix 64-bit pointer truncation bugs
The compiler complains because a pointer is being truncated to a 32-bit integer on all platforms:
drivers/acpi/executer/exmutex.c: In function ‘acpi_ex_release_mutex’:drivers/acpi/executer/exmutex.c:268: warning: cast from pointer to integer of different size drivers/acpi/executer/exmutex.c:268: warning: cast from pointer to integer of different size
drivers/acpi/utilities/utdebug.c: In function ‘acpi_ut_debug_print’:drivers/acpi/utilities/utdebug.c:184: warning: cast from pointer to integer of different size drivers/acpi/utilities/utdebug.c:184: warning: cast from pointer to integer of different size
drivers/acpi/utilities/utmutex.c: In function ‘acpi_ut_acquire_mutex’:drivers/acpi/utilities/utmutex.c:245: warning: cast from pointer to integer of different size drivers/acpi/utilities/utmutex.c:252: warning: cast from pointer to integer of different size drivers/acpi/utilities/utmutex.c:260: warning: cast from pointer to integer of different size drivers/acpi/utilities/utmutex.c: In function ‘acpi_ut_release_mutex’:drivers/acpi/utilities/utmutex.c:287: warning: cast from pointer to integer of different size
Use the standard "%p" specifier when printing pointers directly, and eliminate the need for casts.
drivers/acpi/executer/exmutex.c +3 -3
@@ -266,10 +266,10 @@ acpi_ex_release_mutex(union acpi_operand walk_state->thread->thread_id) && (obj_desc->mutex.os_mutex != ACPI_GLOBAL_LOCK)) {ACPI_ERROR ((AE_INFO , -"Thread %X cannot release Mutex [%4.4s] acquired by thread %X" , - (u32 ) walk_state->thread->thread_id, +"Thread %p cannot release Mutex [%4.4s] acquired by thread %p" , + walk_state->thread->thread_id,acpi_ut_get_node_name (obj_desc->mutex.node), - (u32 ) obj_desc->mutex.owner_thread->thread_id)); + obj_desc->mutex.owner_thread->thread_id));return_ACPI_STATUS (AE_AML_NOT_OWNER ); }
drivers/acpi/utilities/utdebug.c +2 -2
@@ -180,8 +180,8 @@ acpi_ut_debug_print(u32 requested_debug_if (thread_id != acpi_gbl_prev_thread_id) {if (ACPI_LV_THREADS & acpi_dbg_level) {acpi_os_printf - ("\n**** Context Switch from TID %X to TID %X ****\n\n" , - (u32 ) acpi_gbl_prev_thread_id, (u32 ) thread_id); + ("\n**** Context Switch from TID %p to TID %p ****\n\n" , + acpi_gbl_prev_thread_id, thread_id); } acpi_gbl_prev_thread_id = thread_id;
drivers/acpi/utilities/utmutex.c +7 -7
@@ -243,23 +243,23 @@ #ifdef ACPI_MUTEX_DEBUG#endif ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX , -"Thread %X attempting to acquire Mutex [%s]\n" , - (u32 ) this_thread_id,acpi_ut_get_mutex_name (mutex_id))); +"Thread %p attempting to acquire Mutex [%s]\n" , + this_thread_id,acpi_ut_get_mutex_name (mutex_id))); status =acpi_os_acquire_mutex (acpi_gbl_mutex_info[mutex_id].mutex,ACPI_WAIT_FOREVER );if (ACPI_SUCCESS (status)) {ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX , -"Thread %X acquired Mutex [%s]\n" , - (u32 ) this_thread_id, +"Thread %p acquired Mutex [%s]\n" , + this_thread_id,acpi_ut_get_mutex_name (mutex_id))); acpi_gbl_mutex_info[mutex_id].use_count++; acpi_gbl_mutex_info[mutex_id].thread_id = this_thread_id; }else {ACPI_EXCEPTION ((AE_INFO , status, -"Thread %X could not acquire Mutex [%X]" , - (u32 ) this_thread_id, mutex_id)); +"Thread %p could not acquire Mutex [%X]" , + this_thread_id, mutex_id)); }return (status);
@@ -285,7 +285,7 @@ acpi_status acpi_ut_release_mutex(acpi_m this_thread_id =acpi_os_get_thread_id ();ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX , -"Thread %X releasing Mutex [%s]\n" , (u32 ) this_thread_id, +"Thread %p releasing Mutex [%s]\n" , this_thread_id,acpi_ut_get_mutex_name (mutex_id)));if (mutex_id >ACPI_MAX_MUTEX ) {