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

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

diff --git a/kernel/tools/power/acpi/tools/acpidump/apdump.c b/kernel/tools/power/acpi/tools/acpidump/apdump.c
index c736adf..61d0de8 100644 (file)
--- a/kernel/tools/power/acpi/tools/acpidump/apdump.c
+++ b/kernel/tools/power/acpi/tools/acpidump/apdump.c
@@ -329,7 +329,7 @@ int ap_dump_table_by_name(char *signature)
        acpi_status status;
        int table_status;
 
-       if (ACPI_STRLEN(signature) != ACPI_NAME_SIZE) {
+       if (strlen(signature) != ACPI_NAME_SIZE) {
                acpi_log_error
                    ("Invalid table signature [%s]: must be exactly 4 characters\n",
                     signature);
@@ -338,15 +338,15 @@ int ap_dump_table_by_name(char *signature)
 
        /* Table signatures are expected to be uppercase */
 
-       ACPI_STRCPY(local_signature, signature);
+       strcpy(local_signature, signature);
        acpi_ut_strupr(local_signature);
 
        /* To be friendly, handle tables whose signatures do not match the name */
 
        if (ACPI_COMPARE_NAME(local_signature, "FADT")) {
-               ACPI_STRCPY(local_signature, ACPI_SIG_FADT);
+               strcpy(local_signature, ACPI_SIG_FADT);
        } else if (ACPI_COMPARE_NAME(local_signature, "MADT")) {
-               ACPI_STRCPY(local_signature, ACPI_SIG_MADT);
+               strcpy(local_signature, ACPI_SIG_MADT);
        }
 
        /* Dump all instances of this signature (to handle multiple SSDTs) */