diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-05-07 05:39:48 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-05-07 05:39:48 +0000 |
| commit | f9b92b874c7e2b0a97203e8b3e370a82027fee42 (patch) | |
| tree | 5b0afcf9f17c210b1248494d7039b477f403793f /usr/src/uts/intel/io/acpica/utilities/utdelete.c | |
| parent | 99ab767f0b40b10adde1dc9ceaf6bb39d2be5d69 (diff) | |
| parent | 435bba8aa5d73ccd0b9ec7c79e28bec795904992 (diff) | |
| download | illumos-joyent-f9b92b874c7e2b0a97203e8b3e370a82027fee42.tar.gz | |
illumos sync
Diffstat (limited to 'usr/src/uts/intel/io/acpica/utilities/utdelete.c')
| -rw-r--r-- | usr/src/uts/intel/io/acpica/utilities/utdelete.c | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/usr/src/uts/intel/io/acpica/utilities/utdelete.c b/usr/src/uts/intel/io/acpica/utilities/utdelete.c index b87d2f0d59..fb32611121 100644 --- a/usr/src/uts/intel/io/acpica/utilities/utdelete.c +++ b/usr/src/uts/intel/io/acpica/utilities/utdelete.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2011, Intel Corp. + * Copyright (C) 2000 - 2012, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -167,7 +167,7 @@ AcpiUtDeleteInternalObj ( case ACPI_TYPE_PROCESSOR: case ACPI_TYPE_THERMAL: - /* Walk the notify handler list for this object */ + /* Walk the address handler list for this object */ HandlerDesc = Object->CommonNotify.Handler; while (HandlerDesc) @@ -235,6 +235,16 @@ AcpiUtDeleteInternalObj ( ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, "***** Region %p\n", Object)); + /* + * Update AddressRange list. However, only permanent regions + * are installed in this list. (Not created within a method) + */ + if (!(Object->Region.Node->Flags & ANOBJ_TEMPORARY)) + { + AcpiUtRemoveAddressRange (Object->Region.SpaceId, + Object->Region.Node); + } + SecondDesc = AcpiNsGetSecondaryObject (Object); if (SecondDesc) { @@ -513,6 +523,7 @@ AcpiUtUpdateObjectReference ( ACPI_STATUS Status = AE_OK; ACPI_GENERIC_STATE *StateList = NULL; ACPI_OPERAND_OBJECT *NextObject = NULL; + ACPI_OPERAND_OBJECT *PrevObject; ACPI_GENERIC_STATE *State; UINT32 i; @@ -542,10 +553,20 @@ AcpiUtUpdateObjectReference ( case ACPI_TYPE_POWER: case ACPI_TYPE_THERMAL: - /* Update the notify objects for these types (if present) */ - - AcpiUtUpdateRefCount (Object->CommonNotify.SystemNotify, Action); - AcpiUtUpdateRefCount (Object->CommonNotify.DeviceNotify, Action); + /* + * Update the notify objects for these types (if present) + * Two lists, system and device notify handlers. + */ + for (i = 0; i < ACPI_NUM_NOTIFY_TYPES; i++) + { + PrevObject = Object->CommonNotify.NotifyList[i]; + while (PrevObject) + { + NextObject = PrevObject->Notify.Next[i]; + AcpiUtUpdateRefCount (PrevObject, Action); + PrevObject = NextObject; + } + } break; case ACPI_TYPE_PACKAGE: |