summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornjl <njl@FreeBSD.org>2004-01-04 06:35:01 +0000
committernjl <njl@FreeBSD.org>2004-01-04 06:35:01 +0000
commitdd492c4df012defddc6b4ba3d7d684430f23648b (patch)
tree1d8ccc7afc16db43f212bf234f82963e5e195fdb
parentfa2d78c71073044b8172584dc62ed574e0f7891c (diff)
parent0a33e354f93a05661e6afc4245e252b349caa8a2 (diff)
downloadFreeBSD-src-dd492c4df012defddc6b4ba3d7d684430f23648b.zip
FreeBSD-src-dd492c4df012defddc6b4ba3d7d684430f23648b.tar.gz
This commit was generated by cvs2svn to compensate for changes in r124120,
which included commits to RCS files with non-trunk default branches.
-rw-r--r--sys/contrib/dev/acpica/dsmthdat.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/contrib/dev/acpica/dsmthdat.c b/sys/contrib/dev/acpica/dsmthdat.c
index ac5254b..30bb0a2 100644
--- a/sys/contrib/dev/acpica/dsmthdat.c
+++ b/sys/contrib/dev/acpica/dsmthdat.c
@@ -663,6 +663,7 @@ AcpiDsStoreObjectToLocal (
ACPI_NAMESPACE_NODE *Node;
ACPI_OPERAND_OBJECT *CurrentObjDesc;
ACPI_OPERAND_OBJECT *NewObjDesc;
+ UINT8 ObjType;
ACPI_FUNCTION_TRACE ("DsStoreObjectToLocal");
@@ -697,7 +698,11 @@ AcpiDsStoreObjectToLocal (
* take a copy of the object before we store.
*/
NewObjDesc = ObjDesc;
- if (ObjDesc->Common.ReferenceCount > 1)
+ ObjType = ACPI_GET_OBJECT_TYPE(ObjDesc);
+ if (ObjDesc->Common.ReferenceCount > 1 &&
+ ObjType != ACPI_TYPE_BUFFER &&
+ ObjType != ACPI_TYPE_PACKAGE &&
+ ObjType != ACPI_TYPE_REGION)
{
Status = AcpiUtCopyIobjectToIobject (ObjDesc, &NewObjDesc, WalkState);
if (ACPI_FAILURE (Status))
OpenPOWER on IntegriCloud