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

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

diff --git a/kernel/drivers/acpi/acpica/rscreate.c b/kernel/drivers/acpi/acpica/rscreate.c
index 15434e4..a534442 100644 (file)
--- a/kernel/drivers/acpi/acpica/rscreate.c
+++ b/kernel/drivers/acpi/acpica/rscreate.c
@@ -348,18 +348,19 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                                status =
                                    acpi_ns_handle_to_pathname((acpi_handle)
                                                               node,
-                                                              &path_buffer);
+                                                              &path_buffer,
+                                                              FALSE);
 
                                /* +1 to include null terminator */
 
                                user_prt->length +=
-                                   (u32) ACPI_STRLEN(user_prt->source) + 1;
+                                   (u32)strlen(user_prt->source) + 1;
                                break;
 
                        case ACPI_TYPE_STRING:
 
-                               ACPI_STRCPY(user_prt->source,
-                                           obj_desc->string.pointer);
+                               strcpy(user_prt->source,
+                                      obj_desc->string.pointer);
 
                                /*
                                 * Add to the Length field the length of the string