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

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

diff --git a/kernel/drivers/acpi/acpica/exoparg2.c b/kernel/drivers/acpi/acpica/exoparg2.c
index fcc618a..b8944eb 100644 (file)
--- a/kernel/drivers/acpi/acpica/exoparg2.c
+++ b/kernel/drivers/acpi/acpica/exoparg2.c
@@ -337,8 +337,8 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                 * Copy the raw buffer data with no transform.
                 * (NULL terminated already)
                 */
-               ACPI_MEMCPY(return_desc->string.pointer,
-                           operand[0]->buffer.pointer, length);
+               memcpy(return_desc->string.pointer,
+                      operand[0]->buffer.pointer, length);
                break;
 
        case AML_CONCAT_RES_OP:
@@ -380,6 +380,8 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
 
                        return_desc->reference.target_type =
                            ACPI_TYPE_BUFFER_FIELD;
+                       return_desc->reference.index_pointer =
+                           &(operand[0]->buffer.pointer[index]);
                        break;
 
                case ACPI_TYPE_BUFFER:
@@ -391,6 +393,8 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
 
                        return_desc->reference.target_type =
                            ACPI_TYPE_BUFFER_FIELD;
+                       return_desc->reference.index_pointer =
+                           &(operand[0]->buffer.pointer[index]);
                        break;
 
                case ACPI_TYPE_PACKAGE: