diff options
| author | jkim <jkim@FreeBSD.org> | 2012-03-28 17:21:59 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2012-03-28 17:21:59 +0000 |
| commit | b5e3c2bb77a0125c2119063c2135a094534fa050 (patch) | |
| tree | f9e4ca8cad41853a85f614216b8351e8304dc244 /sys/contrib/dev/acpica/include | |
| parent | 1e917a8654b042e4c0c2c8559f69519aabc0b46e (diff) | |
| download | FreeBSD-src-b5e3c2bb77a0125c2119063c2135a094534fa050.zip FreeBSD-src-b5e3c2bb77a0125c2119063c2135a094534fa050.tar.gz | |
MFV: r233615
Revert r233555 and apply a fix for the reference counting regressions.
Tested by: andreast, lme, nwhitehorn,
Sevan / Venture37 (venture37 at gmail dot com)
Submitted by: Robert Moore (robert dot moore at intel dot com)
Diffstat (limited to 'sys/contrib/dev/acpica/include')
| -rw-r--r-- | sys/contrib/dev/acpica/include/aclocal.h | 1 | ||||
| -rw-r--r-- | sys/contrib/dev/acpica/include/acnamesp.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/contrib/dev/acpica/include/aclocal.h b/sys/contrib/dev/acpica/include/aclocal.h index d29a721..30c648d 100644 --- a/sys/contrib/dev/acpica/include/aclocal.h +++ b/sys/contrib/dev/acpica/include/aclocal.h @@ -424,6 +424,7 @@ typedef struct acpi_predefined_data /* Defines for Flags field above */ #define ACPI_OBJECT_REPAIRED 1 +#define ACPI_OBJECT_WRAPPED 2 /* diff --git a/sys/contrib/dev/acpica/include/acnamesp.h b/sys/contrib/dev/acpica/include/acnamesp.h index 5e22cb5..4a91108 100644 --- a/sys/contrib/dev/acpica/include/acnamesp.h +++ b/sys/contrib/dev/acpica/include/acnamesp.h @@ -368,8 +368,9 @@ AcpiNsRepairObject ( ACPI_OPERAND_OBJECT **ReturnObjectPtr); ACPI_STATUS -AcpiNsRepairPackageList ( +AcpiNsWrapWithPackage ( ACPI_PREDEFINED_DATA *Data, + ACPI_OPERAND_OBJECT *OriginalObject, ACPI_OPERAND_OBJECT **ObjDescPtr); ACPI_STATUS |
