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

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

diff --git a/kernel/drivers/acpi/acpica/utmisc.c b/kernel/drivers/acpi/acpica/utmisc.c
index cbb7034..bd4443b 100644 (file)
--- a/kernel/drivers/acpi/acpica/utmisc.c
+++ b/kernel/drivers/acpi/acpica/utmisc.c
@@ -66,16 +66,16 @@ u8 acpi_ut_is_pci_root_bridge(char *id)
         * Check if this is a PCI root bridge.
         * ACPI 3.0+: check for a PCI Express root also.
         */
-       if (!(ACPI_STRCMP(id,
-                         PCI_ROOT_HID_STRING)) ||
-           !(ACPI_STRCMP(id, PCI_EXPRESS_ROOT_HID_STRING))) {
+       if (!(strcmp(id,
+                    PCI_ROOT_HID_STRING)) ||
+           !(strcmp(id, PCI_EXPRESS_ROOT_HID_STRING))) {
                return (TRUE);
        }
 
        return (FALSE);
 }
 
-#if (defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP)
+#if (defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP || defined ACPI_NAMES_APP)
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_is_aml_table
@@ -97,7 +97,8 @@ u8 acpi_ut_is_aml_table(struct acpi_table_header *table)
 
        if (ACPI_COMPARE_NAME(table->signature, ACPI_SIG_DSDT) ||
            ACPI_COMPARE_NAME(table->signature, ACPI_SIG_PSDT) ||
-           ACPI_COMPARE_NAME(table->signature, ACPI_SIG_SSDT)) {
+           ACPI_COMPARE_NAME(table->signature, ACPI_SIG_SSDT) ||
+           ACPI_COMPARE_NAME(table->signature, ACPI_SIG_OSDT)) {
                return (TRUE);
        }
 
@@ -375,7 +376,7 @@ acpi_ut_display_init_pathname(u8 type,
        /* Get the full pathname to the node */
 
        buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;
-       status = acpi_ns_handle_to_pathname(obj_handle, &buffer);
+       status = acpi_ns_handle_to_pathname(obj_handle, &buffer, TRUE);
        if (ACPI_FAILURE(status)) {
                return;
        }