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

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

diff --git a/kernel/drivers/acpi/acpica/nsconvert.c b/kernel/drivers/acpi/acpica/nsconvert.c
index 1a8b39c..da55a1c 100644 (file)
--- a/kernel/drivers/acpi/acpica/nsconvert.c
+++ b/kernel/drivers/acpi/acpica/nsconvert.c
@@ -187,8 +187,8 @@ acpi_ns_convert_to_string(union acpi_operand_object *original_object,
                 * Copy the raw buffer data with no transform. String is already NULL
                 * terminated at Length+1.
                 */
-               ACPI_MEMCPY(new_object->string.pointer,
-                           original_object->buffer.pointer, length);
+               memcpy(new_object->string.pointer,
+                      original_object->buffer.pointer, length);
                break;
 
        default:
@@ -251,9 +251,9 @@ acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
                        return (AE_NO_MEMORY);
                }
 
-               ACPI_MEMCPY(new_object->buffer.pointer,
-                           original_object->string.pointer,
-                           original_object->string.length);
+               memcpy(new_object->buffer.pointer,
+                      original_object->string.pointer,
+                      original_object->string.length);
                break;
 
        case ACPI_TYPE_PACKAGE: