ACPICA 20050708 from Bob Moore <robert.moore@intel.com>

[linux-2.6] / drivers / acpi / namespace / nsalloc.c

diff --git a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/namespace/nsalloc.c
index 5653a19d7172b7f1a6383e5adf6169d8005265bb..edbf1db36b6876099f26d71a0b3e25c5abb58865 100644 (file)
--- a/drivers/acpi/namespace/nsalloc.c
+++ b/drivers/acpi/namespace/nsalloc.c
@@ -83,7 +83,7 @@ acpi_ns_create_node (
                return_PTR (NULL);
        }
 
-       ACPI_MEM_TRACKING (acpi_gbl_memory_lists[ACPI_MEM_LIST_NSNODE].total_allocated++);
+       ACPI_MEM_TRACKING (acpi_gbl_ns_node_list->total_allocated++);
 
        node->name.integer   = name;
        node->reference_count = 1;
@@ -151,7 +151,7 @@ acpi_ns_delete_node (
                }
        }
 
-       ACPI_MEM_TRACKING (acpi_gbl_memory_lists[ACPI_MEM_LIST_NSNODE].total_freed++);
+       ACPI_MEM_TRACKING (acpi_gbl_ns_node_list->total_freed++);
 
        /*
         * Detach an object if there is one then delete the node
@@ -190,7 +190,7 @@ acpi_ns_install_node (
        struct acpi_namespace_node      *node,          /* New Child*/
        acpi_object_type                type)
 {
-       u16                             owner_id = 0;
+       acpi_owner_id                   owner_id = 0;
        struct acpi_namespace_node      *child_node;
 #ifdef ACPI_ALPHABETIC_NAMESPACE
 
@@ -362,7 +362,7 @@ acpi_ns_delete_children (
 
                /* Now we can free this child object */
 
-               ACPI_MEM_TRACKING (acpi_gbl_memory_lists[ACPI_MEM_LIST_NSNODE].total_freed++);
+               ACPI_MEM_TRACKING (acpi_gbl_ns_node_list->total_freed++);
 
                ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, "Object %p, Remaining %X\n",
                        child_node, acpi_gbl_current_node_count));
@@ -559,7 +559,7 @@ acpi_ns_remove_reference (
 
 void
 acpi_ns_delete_namespace_by_owner (
-       u16                             owner_id)
+       acpi_owner_id                    owner_id)
 {
        struct acpi_namespace_node      *child_node;
        struct acpi_namespace_node      *deletion_node;
@@ -635,6 +635,7 @@ acpi_ns_delete_namespace_by_owner (
                }
        }
 
+       (void) acpi_ut_release_owner_id (owner_id);
        return_VOID;
 }