These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / tools / power / acpi / tools / acpidump / apfiles.c

diff --git a/kernel/tools/power/acpi/tools/acpidump/apfiles.c b/kernel/tools/power/acpi/tools/acpidump/apfiles.c
index 8f2fe16..a1c62de 100644 (file)
--- a/kernel/tools/power/acpi/tools/acpidump/apfiles.c
+++ b/kernel/tools/power/acpi/tools/acpidump/apfiles.c
@@ -136,10 +136,10 @@ int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance)
        } else {
                ACPI_MOVE_NAME(filename, table->signature);
        }
-       filename[0] = (char)ACPI_TOLOWER(filename[0]);
-       filename[1] = (char)ACPI_TOLOWER(filename[1]);
-       filename[2] = (char)ACPI_TOLOWER(filename[2]);
-       filename[3] = (char)ACPI_TOLOWER(filename[3]);
+       filename[0] = (char)tolower((int)filename[0]);
+       filename[1] = (char)tolower((int)filename[1]);
+       filename[2] = (char)tolower((int)filename[2]);
+       filename[3] = (char)tolower((int)filename[3]);
        filename[ACPI_NAME_SIZE] = 0;
 
        /* Handle multiple SSDts - create different filenames for each */
@@ -147,10 +147,10 @@ int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance)
        if (instance > 0) {
                acpi_ut_snprintf(instance_str, sizeof(instance_str), "%u",
                                 instance);
-               ACPI_STRCAT(filename, instance_str);
+               strcat(filename, instance_str);
        }
 
-       ACPI_STRCAT(filename, ACPI_TABLE_FILE_SUFFIX);
+       strcat(filename, FILE_SUFFIX_BINARY_TABLE);
 
        if (gbl_verbose_mode) {
                acpi_log_error