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

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

diff --git a/kernel/drivers/acpi/acpica/rsxface.c b/kernel/drivers/acpi/acpica/rsxface.c
index 8e6276d..1e8cd57 100644 (file)
--- a/kernel/drivers/acpi/acpica/rsxface.c
+++ b/kernel/drivers/acpi/acpica/rsxface.c
@@ -220,7 +220,7 @@ acpi_get_current_resources(acpi_handle device_handle,
 }
 
 ACPI_EXPORT_SYMBOL(acpi_get_current_resources)
-#ifdef ACPI_FUTURE_USAGE
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_get_possible_resources
@@ -262,7 +262,7 @@ acpi_get_possible_resources(acpi_handle device_handle,
 }
 
 ACPI_EXPORT_SYMBOL(acpi_get_possible_resources)
-#endif                         /*  ACPI_FUTURE_USAGE  */
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_set_current_resources
@@ -398,8 +398,8 @@ acpi_resource_to_address64(struct acpi_resource *resource,
 
                /* Simple copy for 64 bit source */
 
-               ACPI_MEMCPY(out, &resource->data,
-                           sizeof(struct acpi_resource_address64));
+               memcpy(out, &resource->data,
+                      sizeof(struct acpi_resource_address64));
                break;
 
        default:
@@ -499,7 +499,7 @@ acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context)
         */
        if ((vendor->byte_length < (ACPI_UUID_LENGTH + 1)) ||
            (vendor->uuid_subtype != info->uuid->subtype) ||
-           (ACPI_MEMCMP(vendor->uuid, info->uuid->data, ACPI_UUID_LENGTH))) {
+           (memcmp(vendor->uuid, info->uuid->data, ACPI_UUID_LENGTH))) {
                return (AE_OK);
        }
 
@@ -513,7 +513,7 @@ acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context)
 
        /* Found the correct resource, copy and return it */
 
-       ACPI_MEMCPY(buffer->pointer, resource, resource->length);
+       memcpy(buffer->pointer, resource, resource->length);
        buffer->length = resource->length;
 
        /* Found the desired descriptor, terminate resource walk */