diff options
| author | Dana Myers <Dana.Myers@Sun.COM> | 2009-06-26 17:26:34 -0700 |
|---|---|---|
| committer | Dana Myers <Dana.Myers@Sun.COM> | 2009-06-26 17:26:34 -0700 |
| commit | aa2aa9a662539940ddbc8610da5a3a874ebd7503 (patch) | |
| tree | d2dd92b7b5a29e1dda236a25c20d249a78c49d7c /usr/src/uts/intel/io/acpica/disassembler/dmobject.c | |
| parent | 4cc341244283c4f742842066f99a49422ca19bbd (diff) | |
| download | illumos-joyent-aa2aa9a662539940ddbc8610da5a3a874ebd7503.tar.gz | |
6836969 acpica: update to Intel ACPI CA 20090521
6387741 process_master_file() causes kmem panics given a bogus master file
6837274 acpica: acpi_enum.c creates non-IEEE-1275 'compatible' properties
Diffstat (limited to 'usr/src/uts/intel/io/acpica/disassembler/dmobject.c')
| -rw-r--r-- | usr/src/uts/intel/io/acpica/disassembler/dmobject.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/uts/intel/io/acpica/disassembler/dmobject.c b/usr/src/uts/intel/io/acpica/disassembler/dmobject.c index 3e0f4dc738..0f569922ad 100644 --- a/usr/src/uts/intel/io/acpica/disassembler/dmobject.c +++ b/usr/src/uts/intel/io/acpica/disassembler/dmobject.c @@ -1,7 +1,6 @@ /******************************************************************************* * * Module Name: dmobject - ACPI object decode and display - * $Revision: 1.24 $ * ******************************************************************************/ @@ -9,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2008, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp. * All rights reserved. * * 2. License @@ -116,6 +115,7 @@ #include "acpi.h" +#include "accommon.h" #include "acnamesp.h" #include "acdisasm.h" @@ -278,7 +278,7 @@ AcpiDmDecodeInternalObject ( AcpiOsPrintf (" %s", AcpiUtGetObjectTypeName (ObjDesc)); - switch (ACPI_GET_OBJECT_TYPE (ObjDesc)) + switch (ObjDesc->Common.Type) { case ACPI_TYPE_INTEGER: @@ -416,7 +416,7 @@ AcpiDmDisplayInternalObject ( case ACPI_DESC_TYPE_OPERAND: - Type = ACPI_GET_OBJECT_TYPE (ObjDesc); + Type = ObjDesc->Common.Type; if (Type > ACPI_TYPE_LOCAL_MAX) { AcpiOsPrintf (" Type %X [Invalid Type]", (UINT32) Type); @@ -425,7 +425,7 @@ AcpiDmDisplayInternalObject ( /* Decode the ACPI object type */ - switch (ACPI_GET_OBJECT_TYPE (ObjDesc)) + switch (ObjDesc->Common.Type) { case ACPI_TYPE_LOCAL_REFERENCE: |