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

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

diff --git a/kernel/drivers/acpi/acpica/tbxface.c b/kernel/drivers/acpi/acpica/tbxface.c
index 60e94f8..5559e2c 100644 (file)
--- a/kernel/drivers/acpi/acpica/tbxface.c
+++ b/kernel/drivers/acpi/acpica/tbxface.c
@@ -119,9 +119,9 @@ acpi_initialize_tables(struct acpi_table_desc * initial_table_array,
        } else {
                /* Root Table Array has been statically allocated by the host */
 
-               ACPI_MEMSET(initial_table_array, 0,
-                           (acpi_size) initial_table_count *
-                           sizeof(struct acpi_table_desc));
+               memset(initial_table_array, 0,
+                      (acpi_size) initial_table_count *
+                      sizeof(struct acpi_table_desc));
 
                acpi_gbl_root_table_list.tables = initial_table_array;
                acpi_gbl_root_table_list.max_table_count = initial_table_count;
@@ -242,8 +242,9 @@ acpi_get_table_header(char *signature,
                                if (!header) {
                                        return (AE_NO_MEMORY);
                                }
-                               ACPI_MEMCPY(out_table_header, header,
-                                           sizeof(struct acpi_table_header));
+
+                               memcpy(out_table_header, header,
+                                      sizeof(struct acpi_table_header));
                                acpi_os_unmap_memory(header,
                                                     sizeof(struct
                                                            acpi_table_header));
@@ -251,9 +252,9 @@ acpi_get_table_header(char *signature,
                                return (AE_NOT_FOUND);
                        }
                } else {
-                       ACPI_MEMCPY(out_table_header,
-                                   acpi_gbl_root_table_list.tables[i].pointer,
-                                   sizeof(struct acpi_table_header));
+                       memcpy(out_table_header,
+                              acpi_gbl_root_table_list.tables[i].pointer,
+                              sizeof(struct acpi_table_header));
                }
                return (AE_OK);
        }