From: Stefano Stabellini <sstabellini@kernel.org>
Date: Tue, 10 Oct 2017 20:14:19 +0000 (-0700)
Subject: ARM: replace ACPI_MEMCPY with memcpy
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1179
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3b40cfcd1a1912c2e4c4eb353dc77cbf35c63c3a;p=xen.git

ARM: replace ACPI_MEMCPY with memcpy

ACPI_MEMCPY is defined as memcpy. The macro is for the benefit of
drivers/acpi and shouldn't be used elsewhere.

Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Acked-by: Julien Grall <julien.grall@arm.com>
---

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 2a4dc0ddea..4636b17aa6 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -1582,7 +1582,7 @@ static int acpi_create_rsdp(struct domain *d, struct membank tbl_add[])
     rsdp = acpi_os_map_memory(addr, table_size);
     base_ptr = d->arch.efi_acpi_table
                + acpi_get_table_offset(tbl_add, TBL_RSDP);
-    ACPI_MEMCPY(base_ptr, rsdp, table_size);
+    memcpy(base_ptr, rsdp, table_size);
     acpi_os_unmap_memory(rsdp, table_size);
 
     rsdp = (struct acpi_table_rsdp *)base_ptr;
@@ -1644,7 +1644,7 @@ static int acpi_create_xsdt(struct domain *d, struct membank tbl_add[])
                   / sizeof(u64);
     base_ptr = d->arch.efi_acpi_table
                + acpi_get_table_offset(tbl_add, TBL_XSDT);
-    ACPI_MEMCPY(base_ptr, table, table->length);
+    memcpy(base_ptr, table, table->length);
     acpi_os_unmap_memory(table, sizeof(struct acpi_table_header));
     acpi_os_unmap_memory(rsdp_tbl, sizeof(struct acpi_table_rsdp));
 
@@ -1687,10 +1687,10 @@ static int acpi_create_stao(struct domain *d, struct membank tbl_add[])
     }
 
     base_ptr = d->arch.efi_acpi_table + offset;
-    ACPI_MEMCPY(base_ptr, table, sizeof(struct acpi_table_header));
+    memcpy(base_ptr, table, sizeof(struct acpi_table_header));
 
     stao = (struct acpi_table_stao *)base_ptr;
-    ACPI_MEMCPY(stao->header.signature, ACPI_SIG_STAO, 4);
+    memcpy(stao->header.signature, ACPI_SIG_STAO, 4);
     stao->header.revision = 1;
     stao->header.length = table_size;
     stao->ignore_uart = 1;
@@ -1726,7 +1726,7 @@ static int acpi_create_madt(struct domain *d, struct membank tbl_add[])
     }
 
     base_ptr = d->arch.efi_acpi_table + offset;
-    ACPI_MEMCPY(base_ptr, table, table_size);
+    memcpy(base_ptr, table, table_size);
 
     /* Add Generic Distributor. */
     header = acpi_table_get_entry_madt(ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR, 0);
@@ -1736,7 +1736,7 @@ static int acpi_create_madt(struct domain *d, struct membank tbl_add[])
         return -EINVAL;
     }
     gicd = container_of(header, struct acpi_madt_generic_distributor, header);
-    ACPI_MEMCPY(base_ptr + table_size, gicd,
+    memcpy(base_ptr + table_size, gicd,
                 sizeof(struct acpi_madt_generic_distributor));
     table_size += sizeof(struct acpi_madt_generic_distributor);
 
@@ -1782,7 +1782,7 @@ static int acpi_create_fadt(struct domain *d, struct membank tbl_add[])
     table_size = table->length;
     base_ptr = d->arch.efi_acpi_table
                + acpi_get_table_offset(tbl_add, TBL_FADT);
-    ACPI_MEMCPY(base_ptr, table, table_size);
+    memcpy(base_ptr, table, table_size);
     fadt = (struct acpi_table_fadt *)base_ptr;
 
     /* Set PSCI_COMPLIANT and PSCI_USE_HVC */
diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c
index 60f1ae311d..511c8d7294 100644
--- a/xen/arch/arm/gic-v2.c
+++ b/xen/arch/arm/gic-v2.c
@@ -1039,7 +1039,7 @@ static int gicv2_make_hwdom_madt(const struct domain *d, u32 offset)
     for ( i = 0; i < d->max_vcpus; i++ )
     {
         gicc = (struct acpi_madt_generic_interrupt *)(base_ptr + table_len);
-        ACPI_MEMCPY(gicc, host_gicc, size);
+        memcpy(gicc, host_gicc, size);
         gicc->cpu_interface_number = i;
         gicc->uid = i;
         gicc->flags = ACPI_MADT_ENABLED;
diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c
index 406bb82a3b..74d00e0c54 100644
--- a/xen/arch/arm/gic-v3.c
+++ b/xen/arch/arm/gic-v3.c
@@ -1378,7 +1378,7 @@ static int gicv3_make_hwdom_madt(const struct domain *d, u32 offset)
     for ( i = 0; i < d->max_vcpus; i++ )
     {
         gicc = (struct acpi_madt_generic_interrupt *)(base_ptr + table_len);
-        ACPI_MEMCPY(gicc, host_gicc, size);
+        memcpy(gicc, host_gicc, size);
         gicc->cpu_interface_number = i;
         gicc->uid = i;
         gicc->flags = ACPI_MADT_ENABLED;