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

[kvmfornfv.git] / kernel / drivers / acpi / acpica / utalloc.c

diff --git a/kernel/drivers/acpi/acpica/utalloc.c b/kernel/drivers/acpi/acpica/utalloc.c
index 61d8f6d..7a4101f 100644 (file)
--- a/kernel/drivers/acpi/acpica/utalloc.c
+++ b/kernel/drivers/acpi/acpica/utalloc.c
@@ -73,7 +73,7 @@ void *acpi_os_allocate_zeroed(acpi_size size)
 
                /* Clear the memory block */
 
-               ACPI_MEMSET(allocation, 0, size);
+               memset(allocation, 0, size);
        }
 
        return (allocation);
@@ -181,7 +181,7 @@ acpi_status acpi_ut_delete_caches(void)
        char buffer[7];
 
        if (acpi_gbl_display_final_mem_stats) {
-               ACPI_STRCPY(buffer, "MEMORY");
+               strcpy(buffer, "MEMORY");
                (void)acpi_db_display_statistics(buffer);
        }
 #endif
@@ -337,6 +337,6 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer,
 
        /* Have a valid buffer, clear it */
 
-       ACPI_MEMSET(buffer->pointer, 0, required_length);
+       memset(buffer->pointer, 0, required_length);
        return (AE_OK);
 }