Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ACPICA: Fix issues with arg types within printf format strings

ACPICA commit db2638ccaac84b61e92f34d60c3630ff5217f852

Link: https://github.com/acpica/acpica/commit/db2638cc
Link: https://github.com/acpica/acpica/commit/634c3085
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Bob Moore and committed by
Rafael J. Wysocki
231ec06e 779cc7ce

+13 -15
+1 -1
drivers/acpi/acpica/dbhistry.c
··· 121 121 122 122 for (i = 0; i < acpi_gbl_num_history; i++) { 123 123 if (acpi_gbl_history_buffer[history_index].command) { 124 - acpi_os_printf("%3ld %s\n", 124 + acpi_os_printf("%3u %s\n", 125 125 acpi_gbl_history_buffer[history_index]. 126 126 cmd_num, 127 127 acpi_gbl_history_buffer[history_index].
+1 -1
drivers/acpi/acpica/dbinput.c
··· 593 593 input_buffer)) { 594 594 acpi_os_printf 595 595 ("Buffer overflow while parsing input line (max %u characters)\n", 596 - sizeof(acpi_gbl_db_parsed_buf)); 596 + (u32)sizeof(acpi_gbl_db_parsed_buf)); 597 597 return (0); 598 598 } 599 599
+10 -12
drivers/acpi/acpica/dbstats.c
··· 341 341 "ACPI_TYPE", "NODES", "OBJECTS"); 342 342 343 343 for (i = 0; i < ACPI_TYPE_NS_NODE_MAX; i++) { 344 - acpi_os_printf("%16.16s % 10ld% 10ld\n", 344 + acpi_os_printf("%16.16s % 10u% 10u\n", 345 345 acpi_ut_get_type_name(i), 346 346 acpi_gbl_node_type_count[i], 347 347 acpi_gbl_obj_type_count[i]); 348 348 } 349 349 350 - acpi_os_printf("%16.16s % 10ld% 10ld\n", "Misc/Unknown", 350 + acpi_os_printf("%16.16s % 10u% 10u\n", "Misc/Unknown", 351 351 acpi_gbl_node_type_count_misc, 352 352 acpi_gbl_obj_type_count_misc); 353 353 354 - acpi_os_printf("%16.16s % 10ld% 10ld\n", "TOTALS:", 354 + acpi_os_printf("%16.16s % 10u% 10u\n", "TOTALS:", 355 355 acpi_gbl_num_nodes, acpi_gbl_num_objects); 356 356 break; 357 357 ··· 379 379 case CMD_STAT_MISC: 380 380 381 381 acpi_os_printf("\nMiscellaneous Statistics:\n\n"); 382 - acpi_os_printf("Calls to AcpiPsFind:.. ........% 7ld\n", 383 - acpi_gbl_ps_find_count); 384 - acpi_os_printf("Calls to AcpiNsLookup:..........% 7ld\n", 385 - acpi_gbl_ns_lookup_count); 382 + acpi_os_printf("%-28s: %7lu\n", "Calls to AcpiPsFind", 383 + (u64)acpi_gbl_ps_find_count); 384 + acpi_os_printf("%-28s: %7lu\n", "Calls to AcpiNsLookup", 385 + (u64)acpi_gbl_ns_lookup_count); 386 386 387 - acpi_os_printf("\n"); 388 - 389 - acpi_os_printf("Mutex usage:\n\n"); 387 + acpi_os_printf("\nMutex usage:\n\n"); 390 388 for (i = 0; i < ACPI_NUM_MUTEX; i++) { 391 - acpi_os_printf("%-28s: % 7ld\n", 389 + acpi_os_printf("%-28s: %7lu\n", 392 390 acpi_ut_get_mutex_name(i), 393 - acpi_gbl_mutex_info[i].use_count); 391 + (u64)acpi_gbl_mutex_info[i].use_count); 394 392 } 395 393 break; 396 394
+1 -1
drivers/acpi/acpica/nsrepair2.c
··· 126 126 127 127 #define ACPI_FDE_FIELD_COUNT 5 128 128 #define ACPI_FDE_BYTE_BUFFER_SIZE 5 129 - #define ACPI_FDE_DWORD_BUFFER_SIZE (ACPI_FDE_FIELD_COUNT * sizeof (u32)) 129 + #define ACPI_FDE_DWORD_BUFFER_SIZE (ACPI_FDE_FIELD_COUNT * (u32) sizeof (u32)) 130 130 131 131 /****************************************************************************** 132 132 *