ACPICA: Fix possible warnings for ACPI_THREAD_ID on 64-bit build
Warnings can be generated for printf-like statements that output the ACPI_THREAD_ID on 64-bit builds, since this type can expand to 64-bits depending on how it is defined. Use the %p format specifier to allow the output to automatically expand to 64 bits. 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>
这个提交包含在:
@@ -230,17 +230,18 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
|
||||
if (acpi_gbl_mutex_info[i].thread_id == this_thread_id) {
|
||||
if (i == mutex_id) {
|
||||
ACPI_ERROR((AE_INFO,
|
||||
"Mutex [%s] already acquired by this thread [%X]",
|
||||
"Mutex [%s] already acquired by this thread [%p]",
|
||||
acpi_ut_get_mutex_name
|
||||
(mutex_id),
|
||||
this_thread_id));
|
||||
ACPI_CAST_PTR(void,
|
||||
this_thread_id)));
|
||||
|
||||
return (AE_ALREADY_ACQUIRED);
|
||||
}
|
||||
|
||||
ACPI_ERROR((AE_INFO,
|
||||
"Invalid acquire order: Thread %X owns [%s], wants [%s]",
|
||||
this_thread_id,
|
||||
"Invalid acquire order: Thread %p owns [%s], wants [%s]",
|
||||
ACPI_CAST_PTR(void, this_thread_id),
|
||||
acpi_ut_get_mutex_name(i),
|
||||
acpi_ut_get_mutex_name(mutex_id)));
|
||||
|
||||
@@ -251,24 +252,24 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
|
||||
#endif
|
||||
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
|
||||
"Thread %lX attempting to acquire Mutex [%s]\n",
|
||||
(unsigned long)this_thread_id,
|
||||
"Thread %p attempting to acquire Mutex [%s]\n",
|
||||
ACPI_CAST_PTR(void, 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 %lX acquired Mutex [%s]\n",
|
||||
(unsigned long)this_thread_id,
|
||||
"Thread %p acquired Mutex [%s]\n",
|
||||
ACPI_CAST_PTR(void, 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 %lX could not acquire Mutex [%X]",
|
||||
(unsigned long)this_thread_id, mutex_id));
|
||||
"Thread %p could not acquire Mutex [%X]",
|
||||
ACPI_CAST_PTR(void, this_thread_id), mutex_id));
|
||||
}
|
||||
|
||||
return (status);
|
||||
@@ -293,9 +294,8 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
|
||||
ACPI_FUNCTION_NAME(ut_release_mutex);
|
||||
|
||||
this_thread_id = acpi_os_get_thread_id();
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
|
||||
"Thread %lX releasing Mutex [%s]\n",
|
||||
(unsigned long)this_thread_id,
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Thread %p releasing Mutex [%s]\n",
|
||||
ACPI_CAST_PTR(void, this_thread_id),
|
||||
acpi_ut_get_mutex_name(mutex_id)));
|
||||
|
||||
if (mutex_id > ACPI_MAX_MUTEX) {
|
||||
|
在新工单中引用
屏蔽一个用户