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

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

diff --git a/kernel/drivers/acpi/acpica/rsmisc.c b/kernel/drivers/acpi/acpica/rsmisc.c
index 1fe49d2..ac37852 100644 (file)
--- a/kernel/drivers/acpi/acpica/rsmisc.c
+++ b/kernel/drivers/acpi/acpica/rsmisc.c
@@ -119,7 +119,7 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                        /*
                         * Get the resource type and the initial (minimum) length
                         */
-                       ACPI_MEMSET(resource, 0, INIT_RESOURCE_LENGTH(info));
+                       memset(resource, 0, INIT_RESOURCE_LENGTH(info));
                        resource->type = INIT_RESOURCE_TYPE(info);
                        resource->length = INIT_RESOURCE_LENGTH(info);
                        break;
@@ -324,13 +324,13 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
 
                case ACPI_RSC_SET8:
 
-                       ACPI_MEMSET(destination, info->aml_offset, info->value);
+                       memset(destination, info->aml_offset, info->value);
                        break;
 
                case ACPI_RSC_DATA8:
 
                        target = ACPI_ADD_PTR(char, resource, info->value);
-                       ACPI_MEMCPY(destination, source, ACPI_GET16(target));
+                       memcpy(destination, source, ACPI_GET16(target));
                        break;
 
                case ACPI_RSC_ADDRESS:
@@ -502,7 +502,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                switch (info->opcode) {
                case ACPI_RSC_INITSET:
 
-                       ACPI_MEMSET(aml, 0, INIT_RESOURCE_LENGTH(info));
+                       memset(aml, 0, INIT_RESOURCE_LENGTH(info));
                        aml_length = INIT_RESOURCE_LENGTH(info);
                        acpi_rs_set_resource_header(INIT_RESOURCE_TYPE(info),
                                                    aml_length, aml);