Fix up a multitude of ACPI compiler warnings on x86_64
PATCH 1/1 Fix up a multitude of ACPI compiler warnings on x86_64
32bit vs 64 bit issues. sizeof(sizeof) and sizeof(pointer) is variable, but we're trying to shove it into unsigned int or u32.
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 %lX cannot release Mutex [%4.4s] acquired by thread %lX" , + (unsigned long )walk_state->thread->thread_id,acpi_ut_get_node_name (obj_desc->mutex.node), - (u32 ) obj_desc->mutex.owner_thread->thread_id)); + (unsigned long )obj_desc->mutex.owner_thread->thread_id));return_ACPI_STATUS (AE_AML_NOT_OWNER ); }
drivers/acpi/tables/tbget.c +2 -2
@@ -324,8 +324,8 @@ acpi_tb_get_this_table(struct acpi_pointif (header->length <sizeof (struct acpi_table_header )) {ACPI_ERROR ((AE_INFO , -"Table length (%X) is smaller than minimum (%X)" , - header->length,sizeof (struct acpi_table_header ))); +"Table length (%X) is smaller than minimum (%lX)" , + header->length, (unsigned long )sizeof (struct acpi_table_header )));return_ACPI_STATUS (AE_INVALID_TABLE_LENGTH ); }
drivers/acpi/tables/tbrsdt.c +2 -2
@@ -187,9 +187,9 @@ acpi_status acpi_tb_validate_rsdt(structif (table_ptr->length <sizeof (struct acpi_table_header )) {ACPI_ERROR ((AE_INFO , -"RSDT/XSDT length (%X) is smaller than minimum (%X)" , +"RSDT/XSDT length (%X) is smaller than minimum (%lX)" , table_ptr->length, -sizeof (struct acpi_table_header ))); + (unsigned long )sizeof (struct acpi_table_header )));return (AE_INVALID_TABLE_LENGTH ); }
drivers/acpi/utilities/utdebug.c +3 -2
@@ -180,8 +180,9 @@ 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 %lX to TID %lX ****\n\n" , + (unsigned long ) acpi_gbl_prev_thread_id, + (unsigned long ) thread_id); } acpi_gbl_prev_thread_id = thread_id;
drivers/acpi/utilities/utmutex.c +9 -7
@@ -243,23 +243,24 @@ acpi_status acpi_ut_acquire_mutex(acpi_m#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 %lX attempting to acquire Mutex [%s]\n" , + (unsigned long ) 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 %lX acquired Mutex [%s]\n" , + (unsigned long ) 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 %lX could not acquire Mutex [%X]" , + (unsigned long ) this_thread_id, mutex_id)); }return (status);
@@ -285,7 +286,8 @@ 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 %lX releasing Mutex [%s]\n" , + (unsigned long ) this_thread_id,acpi_ut_get_mutex_name (mutex_id)));if (mutex_id >ACPI_MAX_MUTEX ) {
drivers/acpi/tables/tbrsdt.c acpi_status acpi_tb_validate_rsdt(struct · line 192
Quoted 11 lines · On Fri, 29 Sep 2006 14:37:58 -0700 Martin Bligh <[email protected]> wrote:
32bit vs 64 bit issues. sizeof(sizeof) and sizeof(pointer) is variable, but we're trying to shove it into unsigned int or u32.
...
drivers/acpi/tables/tbrsdt.c +2
-2-"RSDT/XSDT length (%X) is smaller than minimum (%X)" , +"RSDT/XSDT length (%X) is smaller than minimum (%lX)" , table_ptr->length, - sizeof(struct acpi_table_header))); + (unsigned long) sizeof(struct acpi_table_header)));
These two sizeof()s have already been fixed by Randy in -mm's acpi-fix-printk-format-warnings.patch.
Randy's fix is the preferred one: sizeof() returns size_t and size_t's are printed with %z - there's no need to use a typecast.
(Actually Randy used %Z which avoids the warning which old gcc emitted with %z, but is old-fashioned. I'll switch that to %z).
acpi-fix-printk-format-warnings.patch was submitted to the ACPI developers on August 14 and on September 25 but remains unmerged.
Quoted 21 lines · On Fri, 29 Sep 2006 15:05:26 -0700 Andrew Morton wrote:
drivers/acpi/tables/tbrsdt.c acpi_status acpi_tb_validate_rsdt(struct · line 192
Quoted 11 lines · On Fri, 29 Sep 2006 14:37:58 -0700 Martin Bligh <[email protected]> wrote:
32bit vs 64 bit issues. sizeof(sizeof) and sizeof(pointer) is variable, but we're trying to shove it into unsigned int or u32.
...
drivers/acpi/tables/tbrsdt.c +2
-2-"RSDT/XSDT length (%X) is smaller than minimum (%X)" , +"RSDT/XSDT length (%X) is smaller than minimum (%lX)" , table_ptr->length, - sizeof(struct acpi_table_header))); + (unsigned long) sizeof(struct acpi_table_header)));These two sizeof()s have already been fixed by Randy in -mm's acpi-fix-printk-format-warnings.patch.
Randy's fix is the preferred one:
sizeof()returnssize_tand size_t's are printed with %z - there's no need to use a typecast.
Quoted 6 lines
(Actually Randy used %Z which avoids the warning which old gcc emitted with %z, but is old-fashioned. I'll switch that to %z).
acpi-fix-printk-format-warnings.patch was submitted to the ACPI developers on August 14 and on September 25 but remains unmerged.
Len and I discussed that patch some. The question about it is:
why does gcc report this at all? Is this a gcc problem or are we misreading it somehow?
drivers/acpi/tables/tbget.c: In function 'acpi_tb_get_this_table':drivers/acpi/tables/tbget.c:326: warning: format '%X' expects type 'unsigned int', but argument 5 has type 'long unsigned int'
drivers/acpi/tables/tbrsdt.c: In function 'acpi_tb_validate_rsdt':drivers/acpi/tables/tbrsdt.c:189: warning: format '%X' expects type 'unsigned int', but argument 5 has type 'long unsigned int'
Why does it think that sizeof(struct X) is long unsigned int? (and only on 64-bit)
---
~Randy
Quoted 8 lines · On Fri, 29 Sep 2006 16:18:52 -0700 Randy Dunlap <[email protected]> wrote:
Quoted 3 lines
acpi-fix-printk-format-warnings.patch was submitted to the ACPI developers on August 14 and on September 25 but remains unmerged.
Len and I discussed that patch some. The question about it is:
why does gcc report this at all? Is this a gcc problem or are we misreading it somehow?
Quoted 8 lines
drivers/acpi/tables/tbget.c: In function 'acpi_tb_get_this_table':drivers/acpi/tables/tbget.c:326: warning: format '%X' expects type 'unsigned int', but argument 5 has type 'long unsigned int'
drivers/acpi/tables/tbrsdt.c: In function 'acpi_tb_validate_rsdt':drivers/acpi/tables/tbrsdt.c:189: warning: format '%X' expects type 'unsigned int', but argument 5 has type 'long unsigned int'Why does it think that sizeof(struct X) is long unsigned int? (and only on 64-bit)
hm, strange. No warning at all on 32-bit.
Don't know. But the patch is correct.