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

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

diff --git a/kernel/drivers/acpi/acpica/exfldio.c b/kernel/drivers/acpi/acpica/exfldio.c
index 725a374..70b7bbb 100644 (file)
--- a/kernel/drivers/acpi/acpica/exfldio.c
+++ b/kernel/drivers/acpi/acpica/exfldio.c
@@ -416,22 +416,22 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
                         * Copy the data from the source buffer.
                         * Length is the field width in bytes.
                         */
-                       ACPI_MEMCPY(value,
-                                   (obj_desc->buffer_field.buffer_obj)->buffer.
-                                   pointer +
-                                   obj_desc->buffer_field.base_byte_offset +
-                                   field_datum_byte_offset,
-                                   obj_desc->common_field.access_byte_width);
+                       memcpy(value,
+                              (obj_desc->buffer_field.buffer_obj)->buffer.
+                              pointer +
+                              obj_desc->buffer_field.base_byte_offset +
+                              field_datum_byte_offset,
+                              obj_desc->common_field.access_byte_width);
                } else {
                        /*
                         * Copy the data to the target buffer.
                         * Length is the field width in bytes.
                         */
-                       ACPI_MEMCPY((obj_desc->buffer_field.buffer_obj)->buffer.
-                                   pointer +
-                                   obj_desc->buffer_field.base_byte_offset +
-                                   field_datum_byte_offset, value,
-                                   obj_desc->common_field.access_byte_width);
+                       memcpy((obj_desc->buffer_field.buffer_obj)->buffer.
+                              pointer +
+                              obj_desc->buffer_field.base_byte_offset +
+                              field_datum_byte_offset, value,
+                              obj_desc->common_field.access_byte_width);
                }
 
                status = AE_OK;
@@ -703,7 +703,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
                return_ACPI_STATUS(AE_BUFFER_OVERFLOW);
        }
 
-       ACPI_MEMSET(buffer, 0, buffer_length);
+       memset(buffer, 0, buffer_length);
        access_bit_width = ACPI_MUL_8(obj_desc->common_field.access_byte_width);
 
        /* Handle the simple case here */
@@ -720,7 +720,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
                        status =
                            acpi_ex_field_datum_io(obj_desc, 0, &raw_datum,
                                                   ACPI_READ);
-                       ACPI_MEMCPY(buffer, &raw_datum, buffer_length);
+                       memcpy(buffer, &raw_datum, buffer_length);
                }
 
                return_ACPI_STATUS(status);
@@ -793,9 +793,9 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
 
                /* Write merged datum to target buffer */
 
-               ACPI_MEMCPY(((char *)buffer) + buffer_offset, &merged_datum,
-                           ACPI_MIN(obj_desc->common_field.access_byte_width,
-                                    buffer_length - buffer_offset));
+               memcpy(((char *)buffer) + buffer_offset, &merged_datum,
+                      ACPI_MIN(obj_desc->common_field.access_byte_width,
+                               buffer_length - buffer_offset));
 
                buffer_offset += obj_desc->common_field.access_byte_width;
                merged_datum =
@@ -811,9 +811,9 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
 
        /* Write the last datum to the buffer */
 
-       ACPI_MEMCPY(((char *)buffer) + buffer_offset, &merged_datum,
-                   ACPI_MIN(obj_desc->common_field.access_byte_width,
-                            buffer_length - buffer_offset));
+       memcpy(((char *)buffer) + buffer_offset, &merged_datum,
+              ACPI_MIN(obj_desc->common_field.access_byte_width,
+                       buffer_length - buffer_offset));
 
        return_ACPI_STATUS(AE_OK);
 }
@@ -878,7 +878,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
                 * at Byte zero. All unused (upper) bytes of the
                 * buffer will be 0.
                 */
-               ACPI_MEMCPY((char *)new_buffer, (char *)buffer, buffer_length);
+               memcpy((char *)new_buffer, (char *)buffer, buffer_length);
                buffer = new_buffer;
                buffer_length = required_length;
        }
@@ -918,9 +918,9 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
 
        /* Get initial Datum from the input buffer */
 
-       ACPI_MEMCPY(&raw_datum, buffer,
-                   ACPI_MIN(obj_desc->common_field.access_byte_width,
-                            buffer_length - buffer_offset));
+       memcpy(&raw_datum, buffer,
+              ACPI_MIN(obj_desc->common_field.access_byte_width,
+                       buffer_length - buffer_offset));
 
        merged_datum =
            raw_datum << obj_desc->common_field.start_field_bit_offset;
@@ -970,9 +970,9 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
                /* Get the next input datum from the buffer */
 
                buffer_offset += obj_desc->common_field.access_byte_width;
-               ACPI_MEMCPY(&raw_datum, ((char *)buffer) + buffer_offset,
-                           ACPI_MIN(obj_desc->common_field.access_byte_width,
-                                    buffer_length - buffer_offset));
+               memcpy(&raw_datum, ((char *)buffer) + buffer_offset,
+                      ACPI_MIN(obj_desc->common_field.access_byte_width,
+                               buffer_length - buffer_offset));
 
                merged_datum |=
                    raw_datum << obj_desc->common_field.start_field_bit_offset;