diff options
author | jkim <jkim@FreeBSD.org> | 2012-03-27 15:15:30 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2012-03-27 15:15:30 +0000 |
commit | 09a699481b726f6f71f1dfe752f843bb0ca3c78e (patch) | |
tree | 02844a822a7e639880c61fbb4f47ead050febb45 /sys/contrib/dev/acpica/include | |
parent | f89de17b6917a4f64a7873a2f40dce483734bccb (diff) | |
download | FreeBSD-src-09a699481b726f6f71f1dfe752f843bb0ca3c78e.zip FreeBSD-src-09a699481b726f6f71f1dfe752f843bb0ca3c78e.tar.gz |
MFV: r233550
Temporarily revert an upstream commit. This change caused regressions for
too many laptop users. Especially, automatic repair for broken _BIF caused
strange reference counting issues and kernal panics. This reverts:
https://github.com/otcshare/acpica/commit/c995fed15ab41f6feae1299876271ea330f5c1c5
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, 1 insertions, 3 deletions
diff --git a/sys/contrib/dev/acpica/include/aclocal.h b/sys/contrib/dev/acpica/include/aclocal.h index 30c648d..d29a721 100644 --- a/sys/contrib/dev/acpica/include/aclocal.h +++ b/sys/contrib/dev/acpica/include/aclocal.h @@ -424,7 +424,6 @@ 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 4a91108..5e22cb5 100644 --- a/sys/contrib/dev/acpica/include/acnamesp.h +++ b/sys/contrib/dev/acpica/include/acnamesp.h @@ -368,9 +368,8 @@ AcpiNsRepairObject ( ACPI_OPERAND_OBJECT **ReturnObjectPtr); ACPI_STATUS -AcpiNsWrapWithPackage ( +AcpiNsRepairPackageList ( ACPI_PREDEFINED_DATA *Data, - ACPI_OPERAND_OBJECT *OriginalObject, ACPI_OPERAND_OBJECT **ObjDescPtr); ACPI_STATUS |