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

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

diff --git a/kernel/drivers/acpi/acpica/utdecode.c b/kernel/drivers/acpi/acpica/utdecode.c
index 988e23b..ecaaaff 100644 (file)
--- a/kernel/drivers/acpi/acpica/utdecode.c
+++ b/kernel/drivers/acpi/acpica/utdecode.c
@@ -232,12 +232,27 @@ char *acpi_ut_get_type_name(acpi_object_type type)
 
 char *acpi_ut_get_object_type_name(union acpi_operand_object *obj_desc)
 {
+       ACPI_FUNCTION_TRACE(ut_get_object_type_name);
 
        if (!obj_desc) {
-               return ("[NULL Object Descriptor]");
+               ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Null Object Descriptor\n"));
+               return_PTR("[NULL Object Descriptor]");
        }
 
-       return (acpi_ut_get_type_name(obj_desc->common.type));
+       /* These descriptor types share a common area */
+
+       if ((ACPI_GET_DESCRIPTOR_TYPE(obj_desc) != ACPI_DESC_TYPE_OPERAND) &&
+           (ACPI_GET_DESCRIPTOR_TYPE(obj_desc) != ACPI_DESC_TYPE_NAMED)) {
+               ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                 "Invalid object descriptor type: 0x%2.2X [%s] (%p)\n",
+                                 ACPI_GET_DESCRIPTOR_TYPE(obj_desc),
+                                 acpi_ut_get_descriptor_name(obj_desc),
+                                 obj_desc));
+
+               return_PTR("Invalid object");
+       }
+
+       return_PTR(acpi_ut_get_type_name(obj_desc->common.type));
 }
 
 /*******************************************************************************
@@ -407,8 +422,6 @@ static char *acpi_gbl_mutex_names[ACPI_NUM_MUTEX] = {
        "ACPI_MTX_Events",
        "ACPI_MTX_Caches",
        "ACPI_MTX_Memory",
-       "ACPI_MTX_CommandComplete",
-       "ACPI_MTX_CommandReady"
 };
 
 char *acpi_ut_get_mutex_name(u32 mutex_id)