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

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

diff --git a/kernel/drivers/acpi/acpica/exconvrt.c b/kernel/drivers/acpi/acpica/exconvrt.c
index 89a976b..1e4c5b6 100644 (file)
--- a/kernel/drivers/acpi/acpica/exconvrt.c
+++ b/kernel/drivers/acpi/acpica/exconvrt.c
@@ -227,9 +227,8 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
                /* Copy the integer to the buffer, LSB first */
 
                new_buf = return_desc->buffer.pointer;
-               ACPI_MEMCPY(new_buf,
-                           &obj_desc->integer.value,
-                           acpi_gbl_integer_byte_width);
+               memcpy(new_buf,
+                      &obj_desc->integer.value, acpi_gbl_integer_byte_width);
                break;
 
        case ACPI_TYPE_STRING:
@@ -252,8 +251,8 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
                /* Copy the string to the buffer */
 
                new_buf = return_desc->buffer.pointer;
-               ACPI_STRNCPY((char *)new_buf, (char *)obj_desc->string.pointer,
-                            obj_desc->string.length);
+               strncpy((char *)new_buf, (char *)obj_desc->string.pointer,
+                       obj_desc->string.length);
                break;
 
        default:
@@ -619,6 +618,7 @@ acpi_ex_convert_to_target_type(acpi_object_type destination_type,
                break;
 
        case ARGI_TARGETREF:
+       case ARGI_STORE_TARGET:
 
                switch (destination_type) {
                case ACPI_TYPE_INTEGER: