Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / drivers / acpi / utilities / utalloc.c
index 3313439..03b0044 100644 (file)
@@ -1,11 +1,11 @@
 /******************************************************************************
  *
- * Module Name: utalloc - local cache and memory allocation routines
+ * Module Name: utalloc - local memory allocation routines
  *
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <acpi/acpi.h>
 
 #define _COMPONENT          ACPI_UTILITIES
-        ACPI_MODULE_NAME    ("utalloc")
-
-
-/******************************************************************************
- *
- * FUNCTION:    acpi_ut_release_to_cache
- *
- * PARAMETERS:  list_id             - Memory list/cache ID
- *              Object              - The object to be released
- *
- * RETURN:      None
- *
- * DESCRIPTION: Release an object to the specified cache.  If cache is full,
- *              the object is deleted.
- *
- ******************************************************************************/
-
-void
-acpi_ut_release_to_cache (
-       u32                             list_id,
-       void                            *object)
-{
-       struct acpi_memory_list         *cache_info;
-
-
-       ACPI_FUNCTION_ENTRY ();
-
-
-       cache_info = &acpi_gbl_memory_lists[list_id];
+ACPI_MODULE_NAME("utalloc")
 
-#ifdef ACPI_ENABLE_OBJECT_CACHE
-
-       /* If walk cache is full, just free this wallkstate object */
-
-       if (cache_info->cache_depth >= cache_info->max_cache_depth) {
-               ACPI_MEM_FREE (object);
-               ACPI_MEM_TRACKING (cache_info->total_freed++);
-       }
-
-       /* Otherwise put this object back into the cache */
-
-       else {
-               if (ACPI_FAILURE (acpi_ut_acquire_mutex (ACPI_MTX_CACHES))) {
-                       return;
-               }
-
-               /* Mark the object as cached */
-
-               ACPI_MEMSET (object, 0xCA, cache_info->object_size);
-               ACPI_SET_DESCRIPTOR_TYPE (object, ACPI_DESC_TYPE_CACHED);
-
-               /* Put the object at the head of the cache list */
-
-               * (ACPI_CAST_INDIRECT_PTR (char, &(((char *) object)[cache_info->link_offset]))) = cache_info->list_head;
-               cache_info->list_head = object;
-               cache_info->cache_depth++;
-
-               (void) acpi_ut_release_mutex (ACPI_MTX_CACHES);
-       }
+/* Local prototypes */
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
+static struct acpi_debug_mem_block *acpi_ut_find_allocation(void *allocation);
 
-#else
+static acpi_status
+acpi_ut_track_allocation(struct acpi_debug_mem_block *address,
+                        acpi_size size,
+                        u8 alloc_type, u32 component, char *module, u32 line);
 
-       /* Object cache is disabled; just free the object */
+static acpi_status
+acpi_ut_remove_allocation(struct acpi_debug_mem_block *address,
+                         u32 component, char *module, u32 line);
 
-       ACPI_MEM_FREE (object);
-       ACPI_MEM_TRACKING (cache_info->total_freed++);
+static acpi_status
+acpi_ut_create_list(char *list_name,
+                   u16 object_size, struct acpi_memory_list **return_cache);
 #endif
-}
 
-
-/******************************************************************************
+/*******************************************************************************
  *
- * FUNCTION:    acpi_ut_acquire_from_cache
+ * FUNCTION:    acpi_ut_create_caches
  *
- * PARAMETERS:  list_id             - Memory list ID
+ * PARAMETERS:  None
  *
- * RETURN:      A requested object.  NULL if the object could not be
- *              allocated.
+ * RETURN:      Status
  *
- * DESCRIPTION: Get an object from the specified cache.  If cache is empty,
- *              the object is allocated.
+ * DESCRIPTION: Create all local caches
  *
  ******************************************************************************/
 
-void *
-acpi_ut_acquire_from_cache (
-       u32                             list_id)
+acpi_status acpi_ut_create_caches(void)
 {
-       struct acpi_memory_list         *cache_info;
-       void                            *object;
+       acpi_status status;
 
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
 
-       ACPI_FUNCTION_NAME ("ut_acquire_from_cache");
-
-
-       cache_info = &acpi_gbl_memory_lists[list_id];
-
-#ifdef ACPI_ENABLE_OBJECT_CACHE
+       /* Memory allocation lists */
 
-       if (ACPI_FAILURE (acpi_ut_acquire_mutex (ACPI_MTX_CACHES))) {
-               return (NULL);
+       status = acpi_ut_create_list("Acpi-Global", 0, &acpi_gbl_global_list);
+       if (ACPI_FAILURE(status)) {
+               return (status);
        }
 
-       ACPI_MEM_TRACKING (cache_info->cache_requests++);
-
-       /* Check the cache first */
-
-       if (cache_info->list_head) {
-               /* There is an object available, use it */
-
-               object = cache_info->list_head;
-               cache_info->list_head = *(ACPI_CAST_INDIRECT_PTR (char, &(((char *) object)[cache_info->link_offset])));
-
-               ACPI_MEM_TRACKING (cache_info->cache_hits++);
-               cache_info->cache_depth--;
-
-#ifdef ACPI_DBG_TRACK_ALLOCATIONS
-               ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Object %p from %s\n",
-                       object, acpi_gbl_memory_lists[list_id].list_name));
+       status =
+           acpi_ut_create_list("Acpi-Namespace",
+                               sizeof(struct acpi_namespace_node),
+                               &acpi_gbl_ns_node_list);
+       if (ACPI_FAILURE(status)) {
+               return (status);
+       }
 #endif
 
-               if (ACPI_FAILURE (acpi_ut_release_mutex (ACPI_MTX_CACHES))) {
-                       return (NULL);
-               }
-
-               /* Clear (zero) the previously used Object */
+       /* Object Caches, for frequently used objects */
 
-               ACPI_MEMSET (object, 0, cache_info->object_size);
+       status =
+           acpi_os_create_cache("acpi_state", sizeof(union acpi_generic_state),
+                                ACPI_MAX_STATE_CACHE_DEPTH,
+                                &acpi_gbl_state_cache);
+       if (ACPI_FAILURE(status)) {
+               return (status);
        }
 
-       else {
-               /* The cache is empty, create a new object */
-
-               /* Avoid deadlock with ACPI_MEM_CALLOCATE */
-
-               if (ACPI_FAILURE (acpi_ut_release_mutex (ACPI_MTX_CACHES))) {
-                       return (NULL);
-               }
-
-               object = ACPI_MEM_CALLOCATE (cache_info->object_size);
-               ACPI_MEM_TRACKING (cache_info->total_allocated++);
+       status =
+           acpi_os_create_cache("acpi_parse",
+                                sizeof(struct acpi_parse_obj_common),
+                                ACPI_MAX_PARSE_CACHE_DEPTH,
+                                &acpi_gbl_ps_node_cache);
+       if (ACPI_FAILURE(status)) {
+               return (status);
        }
 
-#else
-
-       /* Object cache is disabled; just allocate the object */
+       status =
+           acpi_os_create_cache("acpi_parse_ext",
+                                sizeof(struct acpi_parse_obj_named),
+                                ACPI_MAX_EXTPARSE_CACHE_DEPTH,
+                                &acpi_gbl_ps_node_ext_cache);
+       if (ACPI_FAILURE(status)) {
+               return (status);
+       }
 
-       object = ACPI_MEM_CALLOCATE (cache_info->object_size);
-       ACPI_MEM_TRACKING (cache_info->total_allocated++);
-#endif
+       status =
+           acpi_os_create_cache("acpi_operand",
+                                sizeof(union acpi_operand_object),
+                                ACPI_MAX_OBJECT_CACHE_DEPTH,
+                                &acpi_gbl_operand_cache);
+       if (ACPI_FAILURE(status)) {
+               return (status);
+       }
 
-       return (object);
+       return (AE_OK);
 }
 
-
-#ifdef ACPI_ENABLE_OBJECT_CACHE
-/******************************************************************************
+/*******************************************************************************
  *
- * FUNCTION:    acpi_ut_delete_generic_cache
+ * FUNCTION:    acpi_ut_delete_caches
  *
- * PARAMETERS:  list_id         - Memory list ID
+ * PARAMETERS:  None
  *
- * RETURN:      None
+ * RETURN:      Status
  *
- * DESCRIPTION: Free all objects within the requested cache.
+ * DESCRIPTION: Purge and delete all local caches
  *
  ******************************************************************************/
 
-void
-acpi_ut_delete_generic_cache (
-       u32                             list_id)
+acpi_status acpi_ut_delete_caches(void)
 {
-       struct acpi_memory_list         *cache_info;
-       char                            *next;
-
 
-       ACPI_FUNCTION_ENTRY ();
+       (void)acpi_os_delete_cache(acpi_gbl_state_cache);
+       acpi_gbl_state_cache = NULL;
 
+       (void)acpi_os_delete_cache(acpi_gbl_operand_cache);
+       acpi_gbl_operand_cache = NULL;
 
-       cache_info = &acpi_gbl_memory_lists[list_id];
-       while (cache_info->list_head) {
-               /* Delete one cached state object */
+       (void)acpi_os_delete_cache(acpi_gbl_ps_node_cache);
+       acpi_gbl_ps_node_cache = NULL;
 
-               next = *(ACPI_CAST_INDIRECT_PTR (char, &(((char *) cache_info->list_head)[cache_info->link_offset])));
-               ACPI_MEM_FREE (cache_info->list_head);
+       (void)acpi_os_delete_cache(acpi_gbl_ps_node_ext_cache);
+       acpi_gbl_ps_node_ext_cache = NULL;
 
-               cache_info->list_head = next;
-               cache_info->cache_depth--;
-       }
+       return (AE_OK);
 }
-#endif
-
 
 /*******************************************************************************
  *
@@ -250,9 +180,7 @@ acpi_ut_delete_generic_cache (
  *
  ******************************************************************************/
 
-acpi_status
-acpi_ut_validate_buffer (
-       struct acpi_buffer              *buffer)
+acpi_status acpi_ut_validate_buffer(struct acpi_buffer * buffer)
 {
 
        /* Obviously, the structure pointer must be valid */
@@ -263,9 +191,9 @@ acpi_ut_validate_buffer (
 
        /* Special semantics for the length */
 
-       if ((buffer->length == ACPI_NO_BUFFER)              ||
-               (buffer->length == ACPI_ALLOCATE_BUFFER)        ||
-               (buffer->length == ACPI_ALLOCATE_LOCAL_BUFFER)) {
+       if ((buffer->length == ACPI_NO_BUFFER) ||
+           (buffer->length == ACPI_ALLOCATE_BUFFER) ||
+           (buffer->length == ACPI_ALLOCATE_LOCAL_BUFFER)) {
                return (AE_OK);
        }
 
@@ -278,7 +206,6 @@ acpi_ut_validate_buffer (
        return (AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_initialize_buffer
@@ -294,12 +221,10 @@ acpi_ut_validate_buffer (
  ******************************************************************************/
 
 acpi_status
-acpi_ut_initialize_buffer (
-       struct acpi_buffer              *buffer,
-       acpi_size                       required_length)
+acpi_ut_initialize_buffer(struct acpi_buffer * buffer,
+                         acpi_size required_length)
 {
-       acpi_status                     status = AE_OK;
-
+       acpi_status status = AE_OK;
 
        switch (buffer->length) {
        case ACPI_NO_BUFFER:
@@ -309,33 +234,30 @@ acpi_ut_initialize_buffer (
                status = AE_BUFFER_OVERFLOW;
                break;
 
-
        case ACPI_ALLOCATE_BUFFER:
 
                /* Allocate a new buffer */
 
-               buffer->pointer = acpi_os_allocate (required_length);
+               buffer->pointer = acpi_os_allocate(required_length);
                if (!buffer->pointer) {
                        return (AE_NO_MEMORY);
                }
 
                /* Clear the buffer */
 
-               ACPI_MEMSET (buffer->pointer, 0, required_length);
+               ACPI_MEMSET(buffer->pointer, 0, required_length);
                break;
 
-
        case ACPI_ALLOCATE_LOCAL_BUFFER:
 
                /* Allocate a new buffer with local interface to allow tracking */
 
-               buffer->pointer = ACPI_MEM_CALLOCATE (required_length);
+               buffer->pointer = ACPI_MEM_CALLOCATE(required_length);
                if (!buffer->pointer) {
                        return (AE_NO_MEMORY);
                }
                break;
 
-
        default:
 
                /* Existing buffer: Validate the size of the buffer */
@@ -347,7 +269,7 @@ acpi_ut_initialize_buffer (
 
                /* Clear the buffer */
 
-               ACPI_MEMSET (buffer->pointer, 0, required_length);
+               ACPI_MEMSET(buffer->pointer, 0, required_length);
                break;
        }
 
@@ -355,7 +277,6 @@ acpi_ut_initialize_buffer (
        return (status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_allocate
@@ -371,41 +292,34 @@ acpi_ut_initialize_buffer (
  *
  ******************************************************************************/
 
-void *
-acpi_ut_allocate (
-       acpi_size                       size,
-       u32                             component,
-       char                            *module,
-       u32                             line)
+void *acpi_ut_allocate(acpi_size size, u32 component, char *module, u32 line)
 {
-       void                            *allocation;
-
-
-       ACPI_FUNCTION_TRACE_U32 ("ut_allocate", size);
+       void *allocation;
 
+       ACPI_FUNCTION_TRACE_U32("ut_allocate", size);
 
        /* Check for an inadvertent size of zero bytes */
 
        if (!size) {
-               _ACPI_REPORT_ERROR (module, line, component,
-                               ("ut_allocate: Attempt to allocate zero bytes\n"));
+               ACPI_ERROR((module, line,
+                           "ut_allocate: Attempt to allocate zero bytes, allocating 1 byte"));
                size = 1;
        }
 
-       allocation = acpi_os_allocate (size);
+       allocation = acpi_os_allocate(size);
        if (!allocation) {
                /* Report allocation error */
 
-               _ACPI_REPORT_ERROR (module, line, component,
-                               ("ut_allocate: Could not allocate size %X\n", (u32) size));
+               ACPI_ERROR((module, line,
+                           "ut_allocate: Could not allocate size %X",
+                           (u32) size));
 
-               return_PTR (NULL);
+               return_PTR(NULL);
        }
 
-       return_PTR (allocation);
+       return_PTR(allocation);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_callocate
@@ -421,43 +335,35 @@ acpi_ut_allocate (
  *
  ******************************************************************************/
 
-void *
-acpi_ut_callocate (
-       acpi_size                       size,
-       u32                             component,
-       char                            *module,
-       u32                             line)
+void *acpi_ut_callocate(acpi_size size, u32 component, char *module, u32 line)
 {
-       void                            *allocation;
-
-
-       ACPI_FUNCTION_TRACE_U32 ("ut_callocate", size);
+       void *allocation;
 
+       ACPI_FUNCTION_TRACE_U32("ut_callocate", size);
 
        /* Check for an inadvertent size of zero bytes */
 
        if (!size) {
-               _ACPI_REPORT_ERROR (module, line, component,
-                               ("ut_callocate: Attempt to allocate zero bytes\n"));
-               return_PTR (NULL);
+               ACPI_ERROR((module, line,
+                           "Attempt to allocate zero bytes, allocating 1 byte"));
+               size = 1;
        }
 
-       allocation = acpi_os_allocate (size);
+       allocation = acpi_os_allocate(size);
        if (!allocation) {
                /* Report allocation error */
 
-               _ACPI_REPORT_ERROR (module, line, component,
-                               ("ut_callocate: Could not allocate size %X\n", (u32) size));
-               return_PTR (NULL);
+               ACPI_ERROR((module, line,
+                           "Could not allocate size %X", (u32) size));
+               return_PTR(NULL);
        }
 
        /* Clear the memory block */
 
-       ACPI_MEMSET (allocation, 0, size);
-       return_PTR (allocation);
+       ACPI_MEMSET(allocation, 0, size);
+       return_PTR(allocation);
 }
 
-
 #ifdef ACPI_DBG_TRACK_ALLOCATIONS
 /*
  * These procedures are used for tracking memory leaks in the subsystem, and
@@ -470,6 +376,39 @@ acpi_ut_callocate (
  * occurs in the body of acpi_ut_free.
  */
 
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_create_list
+ *
+ * PARAMETERS:  cache_name      - Ascii name for the cache
+ *              object_size     - Size of each cached object
+ *              return_cache    - Where the new cache object is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Create a local memory list for tracking purposed
+ *
+ ******************************************************************************/
+
+static acpi_status
+acpi_ut_create_list(char *list_name,
+                   u16 object_size, struct acpi_memory_list **return_cache)
+{
+       struct acpi_memory_list *cache;
+
+       cache = acpi_os_allocate(sizeof(struct acpi_memory_list));
+       if (!cache) {
+               return (AE_NO_MEMORY);
+       }
+
+       ACPI_MEMSET(cache, 0, sizeof(struct acpi_memory_list));
+
+       cache->list_name = list_name;
+       cache->object_size = object_size;
+
+       *return_cache = cache;
+       return (AE_OK);
+}
 
 /*******************************************************************************
  *
@@ -486,37 +425,33 @@ acpi_ut_callocate (
  *
  ******************************************************************************/
 
-void *
-acpi_ut_allocate_and_track (
-       acpi_size                       size,
-       u32                             component,
-       char                            *module,
-       u32                             line)
+void *acpi_ut_allocate_and_track(acpi_size size,
+                                u32 component, char *module, u32 line)
 {
-       struct acpi_debug_mem_block     *allocation;
-       acpi_status                     status;
-
+       struct acpi_debug_mem_block *allocation;
+       acpi_status status;
 
-       allocation = acpi_ut_allocate (size + sizeof (struct acpi_debug_mem_header), component,
-                         module, line);
+       allocation =
+           acpi_ut_allocate(size + sizeof(struct acpi_debug_mem_header),
+                            component, module, line);
        if (!allocation) {
                return (NULL);
        }
 
-       status = acpi_ut_track_allocation (ACPI_MEM_LIST_GLOBAL, allocation, size,
-                         ACPI_MEM_MALLOC, component, module, line);
-       if (ACPI_FAILURE (status)) {
-               acpi_os_free (allocation);
+       status = acpi_ut_track_allocation(allocation, size,
+                                         ACPI_MEM_MALLOC, component, module,
+                                         line);
+       if (ACPI_FAILURE(status)) {
+               acpi_os_free(allocation);
                return (NULL);
        }
 
-       acpi_gbl_memory_lists[ACPI_MEM_LIST_GLOBAL].total_allocated++;
-       acpi_gbl_memory_lists[ACPI_MEM_LIST_GLOBAL].current_total_size += (u32) size;
+       acpi_gbl_global_list->total_allocated++;
+       acpi_gbl_global_list->current_total_size += (u32) size;
 
-       return ((void *) &allocation->user_space);
+       return ((void *)&allocation->user_space);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_callocate_and_track
@@ -532,41 +467,37 @@ acpi_ut_allocate_and_track (
  *
  ******************************************************************************/
 
-void *
-acpi_ut_callocate_and_track (
-       acpi_size                       size,
-       u32                             component,
-       char                            *module,
-       u32                             line)
+void *acpi_ut_callocate_and_track(acpi_size size,
+                                 u32 component, char *module, u32 line)
 {
-       struct acpi_debug_mem_block     *allocation;
-       acpi_status                     status;
-
+       struct acpi_debug_mem_block *allocation;
+       acpi_status status;
 
-       allocation = acpi_ut_callocate (size + sizeof (struct acpi_debug_mem_header), component,
-                         module, line);
+       allocation =
+           acpi_ut_callocate(size + sizeof(struct acpi_debug_mem_header),
+                             component, module, line);
        if (!allocation) {
                /* Report allocation error */
 
-               _ACPI_REPORT_ERROR (module, line, component,
-                               ("ut_callocate: Could not allocate size %X\n", (u32) size));
+               ACPI_ERROR((module, line,
+                           "Could not allocate size %X", (u32) size));
                return (NULL);
        }
 
-       status = acpi_ut_track_allocation (ACPI_MEM_LIST_GLOBAL, allocation, size,
-                          ACPI_MEM_CALLOC, component, module, line);
-       if (ACPI_FAILURE (status)) {
-               acpi_os_free (allocation);
+       status = acpi_ut_track_allocation(allocation, size,
+                                         ACPI_MEM_CALLOC, component, module,
+                                         line);
+       if (ACPI_FAILURE(status)) {
+               acpi_os_free(allocation);
                return (NULL);
        }
 
-       acpi_gbl_memory_lists[ACPI_MEM_LIST_GLOBAL].total_allocated++;
-       acpi_gbl_memory_lists[ACPI_MEM_LIST_GLOBAL].current_total_size += (u32) size;
+       acpi_gbl_global_list->total_allocated++;
+       acpi_gbl_global_list->current_total_size += (u32) size;
 
-       return ((void *) &allocation->user_space);
+       return ((void *)&allocation->user_space);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_free_and_track
@@ -583,53 +514,42 @@ acpi_ut_callocate_and_track (
  ******************************************************************************/
 
 void
-acpi_ut_free_and_track (
-       void                            *allocation,
-       u32                             component,
-       char                            *module,
-       u32                             line)
+acpi_ut_free_and_track(void *allocation, u32 component, char *module, u32 line)
 {
-       struct acpi_debug_mem_block     *debug_block;
-       acpi_status                     status;
-
-
-       ACPI_FUNCTION_TRACE_PTR ("ut_free", allocation);
+       struct acpi_debug_mem_block *debug_block;
+       acpi_status status;
 
+       ACPI_FUNCTION_TRACE_PTR("ut_free", allocation);
 
        if (NULL == allocation) {
-               _ACPI_REPORT_ERROR (module, line, component,
-                       ("acpi_ut_free: Attempt to delete a NULL address\n"));
+               ACPI_ERROR((module, line, "Attempt to delete a NULL address"));
 
                return_VOID;
        }
 
-       debug_block = ACPI_CAST_PTR (struct acpi_debug_mem_block,
-                         (((char *) allocation) - sizeof (struct acpi_debug_mem_header)));
+       debug_block = ACPI_CAST_PTR(struct acpi_debug_mem_block,
+                                   (((char *)allocation) -
+                                    sizeof(struct acpi_debug_mem_header)));
 
-       acpi_gbl_memory_lists[ACPI_MEM_LIST_GLOBAL].total_freed++;
-       acpi_gbl_memory_lists[ACPI_MEM_LIST_GLOBAL].current_total_size -= debug_block->size;
+       acpi_gbl_global_list->total_freed++;
+       acpi_gbl_global_list->current_total_size -= debug_block->size;
 
-       status = acpi_ut_remove_allocation (ACPI_MEM_LIST_GLOBAL, debug_block,
-                         component, module, line);
-       if (ACPI_FAILURE (status)) {
-               ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not free memory, %s\n",
-                       acpi_format_exception (status)));
+       status = acpi_ut_remove_allocation(debug_block,
+                                          component, module, line);
+       if (ACPI_FAILURE(status)) {
+               ACPI_EXCEPTION((AE_INFO, status, "Could not free memory"));
        }
 
-       acpi_os_free (debug_block);
-
-       ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, "%p freed\n", allocation));
-
+       acpi_os_free(debug_block);
+       ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, "%p freed\n", allocation));
        return_VOID;
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_find_allocation
  *
- * PARAMETERS:  list_id                 - Memory list to search
- *              Allocation              - Address of allocated memory
+ * PARAMETERS:  Allocation              - Address of allocated memory
  *
  * RETURN:      A list element if found; NULL otherwise.
  *
@@ -637,22 +557,13 @@ acpi_ut_free_and_track (
  *
  ******************************************************************************/
 
-struct acpi_debug_mem_block *
-acpi_ut_find_allocation (
-       u32                             list_id,
-       void                            *allocation)
+static struct acpi_debug_mem_block *acpi_ut_find_allocation(void *allocation)
 {
-       struct acpi_debug_mem_block     *element;
-
+       struct acpi_debug_mem_block *element;
 
-       ACPI_FUNCTION_ENTRY ();
+       ACPI_FUNCTION_ENTRY();
 
-
-       if (list_id > ACPI_MEM_LIST_MAX) {
-               return (NULL);
-       }
-
-       element = acpi_gbl_memory_lists[list_id].list_head;
+       element = acpi_gbl_global_list->list_head;
 
        /* Search for the address. */
 
@@ -667,13 +578,11 @@ acpi_ut_find_allocation (
        return (NULL);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_track_allocation
  *
- * PARAMETERS:  list_id             - Memory list to search
- *              Allocation          - Address of allocated memory
+ * PARAMETERS:  Allocation          - Address of allocated memory
  *              Size                - Size of the allocation
  *              alloc_type          - MEM_MALLOC or MEM_CALLOC
  *              Component           - Component type of caller
@@ -686,63 +595,54 @@ acpi_ut_find_allocation (
  *
  ******************************************************************************/
 
-acpi_status
-acpi_ut_track_allocation (
-       u32                             list_id,
-       struct acpi_debug_mem_block     *allocation,
-       acpi_size                       size,
-       u8                              alloc_type,
-       u32                             component,
-       char                            *module,
-       u32                             line)
+static acpi_status
+acpi_ut_track_allocation(struct acpi_debug_mem_block *allocation,
+                        acpi_size size,
+                        u8 alloc_type, u32 component, char *module, u32 line)
 {
-       struct acpi_memory_list         *mem_list;
-       struct acpi_debug_mem_block     *element;
-       acpi_status                     status = AE_OK;
-
-
-       ACPI_FUNCTION_TRACE_PTR ("ut_track_allocation", allocation);
+       struct acpi_memory_list *mem_list;
+       struct acpi_debug_mem_block *element;
+       acpi_status status = AE_OK;
 
+       ACPI_FUNCTION_TRACE_PTR("ut_track_allocation", allocation);
 
-       if (list_id > ACPI_MEM_LIST_MAX) {
-               return_ACPI_STATUS (AE_BAD_PARAMETER);
-       }
-
-       mem_list = &acpi_gbl_memory_lists[list_id];
-       status = acpi_ut_acquire_mutex (ACPI_MTX_MEMORY);
-       if (ACPI_FAILURE (status)) {
-               return_ACPI_STATUS (status);
+       mem_list = acpi_gbl_global_list;
+       status = acpi_ut_acquire_mutex(ACPI_MTX_MEMORY);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
        }
 
        /*
         * Search list for this address to make sure it is not already on the list.
         * This will catch several kinds of problems.
         */
-
-       element = acpi_ut_find_allocation (list_id, allocation);
+       element = acpi_ut_find_allocation(allocation);
        if (element) {
-               ACPI_REPORT_ERROR (("ut_track_allocation: Allocation already present in list! (%p)\n",
-                       allocation));
+               ACPI_ERROR((AE_INFO,
+                           "ut_track_allocation: Allocation already present in list! (%p)",
+                           allocation));
 
-               ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Element %p Address %p\n", element, allocation));
+               ACPI_ERROR((AE_INFO, "Element %p Address %p",
+                           element, allocation));
 
                goto unlock_and_exit;
        }
 
        /* Fill in the instance data. */
 
-       allocation->size      = (u32) size;
+       allocation->size = (u32) size;
        allocation->alloc_type = alloc_type;
        allocation->component = component;
-       allocation->line      = line;
+       allocation->line = line;
 
-       ACPI_STRNCPY (allocation->module, module, ACPI_MAX_MODULE_NAME);
-       allocation->module[ACPI_MAX_MODULE_NAME-1] = 0;
+       ACPI_STRNCPY(allocation->module, module, ACPI_MAX_MODULE_NAME);
+       allocation->module[ACPI_MAX_MODULE_NAME - 1] = 0;
 
        /* Insert at list head */
 
        if (mem_list->list_head) {
-               ((struct acpi_debug_mem_block *)(mem_list->list_head))->previous = allocation;
+               ((struct acpi_debug_mem_block *)(mem_list->list_head))->
+                   previous = allocation;
        }
 
        allocation->next = mem_list->list_head;
@@ -750,19 +650,16 @@ acpi_ut_track_allocation (
 
        mem_list->list_head = allocation;
 
-
-unlock_and_exit:
-       status = acpi_ut_release_mutex (ACPI_MTX_MEMORY);
-       return_ACPI_STATUS (status);
+      unlock_and_exit:
+       status = acpi_ut_release_mutex(ACPI_MTX_MEMORY);
+       return_ACPI_STATUS(status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_remove_allocation
  *
- * PARAMETERS:  list_id             - Memory list to search
- *              Allocation          - Address of allocated memory
+ * PARAMETERS:  Allocation          - Address of allocated memory
  *              Component           - Component type of caller
  *              Module              - Source file name of caller
  *              Line                - Line number of caller
@@ -773,46 +670,35 @@ unlock_and_exit:
  *
  ******************************************************************************/
 
-acpi_status
-acpi_ut_remove_allocation (
-       u32                             list_id,
-       struct acpi_debug_mem_block     *allocation,
-       u32                             component,
-       char                            *module,
-       u32                             line)
+static acpi_status
+acpi_ut_remove_allocation(struct acpi_debug_mem_block *allocation,
+                         u32 component, char *module, u32 line)
 {
-       struct acpi_memory_list         *mem_list;
-       acpi_status                     status;
-
-
-       ACPI_FUNCTION_TRACE ("ut_remove_allocation");
+       struct acpi_memory_list *mem_list;
+       acpi_status status;
 
+       ACPI_FUNCTION_TRACE("ut_remove_allocation");
 
-       if (list_id > ACPI_MEM_LIST_MAX) {
-               return_ACPI_STATUS (AE_BAD_PARAMETER);
-       }
-
-       mem_list = &acpi_gbl_memory_lists[list_id];
+       mem_list = acpi_gbl_global_list;
        if (NULL == mem_list->list_head) {
                /* No allocations! */
 
-               _ACPI_REPORT_ERROR (module, line, component,
-                               ("ut_remove_allocation: Empty allocation list, nothing to free!\n"));
+               ACPI_ERROR((module, line,
+                           "Empty allocation list, nothing to free!"));
 
-               return_ACPI_STATUS (AE_OK);
+               return_ACPI_STATUS(AE_OK);
        }
 
-       status = acpi_ut_acquire_mutex (ACPI_MTX_MEMORY);
-       if (ACPI_FAILURE (status)) {
-               return_ACPI_STATUS (status);
+       status = acpi_ut_acquire_mutex(ACPI_MTX_MEMORY);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
        }
 
        /* Unlink */
 
        if (allocation->previous) {
                (allocation->previous)->next = allocation->next;
-       }
-       else {
+       } else {
                mem_list->list_head = allocation->next;
        }
 
@@ -822,15 +708,15 @@ acpi_ut_remove_allocation (
 
        /* Mark the segment as deleted */
 
-       ACPI_MEMSET (&allocation->user_space, 0xEA, allocation->size);
+       ACPI_MEMSET(&allocation->user_space, 0xEA, allocation->size);
 
-       ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, "Freeing size 0%X\n", allocation->size));
+       ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, "Freeing size 0%X\n",
+                         allocation->size));
 
-       status = acpi_ut_release_mutex (ACPI_MTX_MEMORY);
-       return_ACPI_STATUS (status);
+       status = acpi_ut_release_mutex(ACPI_MTX_MEMORY);
+       return_ACPI_STATUS(status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_dump_allocation_info
@@ -842,16 +728,15 @@ acpi_ut_remove_allocation (
  * DESCRIPTION: Print some info about the outstanding allocations.
  *
  ******************************************************************************/
+
 #ifdef ACPI_FUTURE_USAGE
-void
-acpi_ut_dump_allocation_info (
-       void)
+void acpi_ut_dump_allocation_info(void)
 {
 /*
        struct acpi_memory_list         *mem_list;
 */
 
-       ACPI_FUNCTION_TRACE ("ut_dump_allocation_info");
+       ACPI_FUNCTION_TRACE("ut_dump_allocation_info");
 
 /*
        ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,
@@ -864,7 +749,6 @@ acpi_ut_dump_allocation_info (
                          mem_list->max_concurrent_count,
                          ROUND_UP_TO_1K (mem_list->max_concurrent_size)));
 
-
        ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,
                          ("%30s: %4d (%3d Kb)\n", "Total (all) internal objects",
                          running_object_count,
@@ -875,7 +759,6 @@ acpi_ut_dump_allocation_info (
                          running_alloc_count,
                          ROUND_UP_TO_1K (running_alloc_size)));
 
-
        ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,
                          ("%30s: %4d (%3d Kb)\n", "Current Nodes",
                          acpi_gbl_current_node_count,
@@ -884,12 +767,12 @@ acpi_ut_dump_allocation_info (
        ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,
                          ("%30s: %4d (%3d Kb)\n", "Max Nodes",
                          acpi_gbl_max_concurrent_node_count,
-                         ROUND_UP_TO_1K ((acpi_gbl_max_concurrent_node_count * sizeof (struct acpi_namespace_node)))));
+                         ROUND_UP_TO_1K ((acpi_gbl_max_concurrent_node_count *
+                                        sizeof (struct acpi_namespace_node)))));
 */
        return_VOID;
 }
-#endif  /*  ACPI_FUTURE_USAGE  */
-
+#endif                         /*  ACPI_FUTURE_USAGE  */
 
 /*******************************************************************************
  *
@@ -904,85 +787,86 @@ acpi_ut_dump_allocation_info (
  *
  ******************************************************************************/
 
-void
-acpi_ut_dump_allocations (
-       u32                             component,
-       char                            *module)
+void acpi_ut_dump_allocations(u32 component, char *module)
 {
-       struct acpi_debug_mem_block     *element;
-       union acpi_descriptor           *descriptor;
-       u32                             num_outstanding = 0;
-
-
-       ACPI_FUNCTION_TRACE ("ut_dump_allocations");
+       struct acpi_debug_mem_block *element;
+       union acpi_descriptor *descriptor;
+       u32 num_outstanding = 0;
 
+       ACPI_FUNCTION_TRACE("ut_dump_allocations");
 
        /*
         * Walk the allocation list.
         */
-       if (ACPI_FAILURE (acpi_ut_acquire_mutex (ACPI_MTX_MEMORY))) {
+       if (ACPI_FAILURE(acpi_ut_acquire_mutex(ACPI_MTX_MEMORY))) {
                return;
        }
 
-       element = acpi_gbl_memory_lists[0].list_head;
+       element = acpi_gbl_global_list->list_head;
        while (element) {
                if ((element->component & component) &&
-                       ((module == NULL) || (0 == ACPI_STRCMP (module, element->module)))) {
+                   ((module == NULL)
+                    || (0 == ACPI_STRCMP(module, element->module)))) {
                        /* Ignore allocated objects that are in a cache */
 
-                       descriptor = ACPI_CAST_PTR (union acpi_descriptor, &element->user_space);
+                       descriptor =
+                           ACPI_CAST_PTR(union acpi_descriptor,
+                                         &element->user_space);
                        if (descriptor->descriptor_id != ACPI_DESC_TYPE_CACHED) {
-                               acpi_os_printf ("%p Len %04X %9.9s-%d [%s] ",
-                                                descriptor, element->size, element->module,
-                                                element->line, acpi_ut_get_descriptor_name (descriptor));
+                               acpi_os_printf("%p Len %04X %9.9s-%d [%s] ",
+                                              descriptor, element->size,
+                                              element->module, element->line,
+                                              acpi_ut_get_descriptor_name
+                                              (descriptor));
 
                                /* Most of the elements will be Operand objects. */
 
-                               switch (ACPI_GET_DESCRIPTOR_TYPE (descriptor)) {
+                               switch (ACPI_GET_DESCRIPTOR_TYPE(descriptor)) {
                                case ACPI_DESC_TYPE_OPERAND:
-                                       acpi_os_printf ("%12.12s R%hd",
-                                                       acpi_ut_get_type_name (descriptor->object.common.type),
-                                                       descriptor->object.common.reference_count);
+                                       acpi_os_printf("%12.12s R%hd",
+                                                      acpi_ut_get_type_name
+                                                      (descriptor->object.
+                                                       common.type),
+                                                      descriptor->object.
+                                                      common.reference_count);
                                        break;
 
                                case ACPI_DESC_TYPE_PARSER:
-                                       acpi_os_printf ("aml_opcode %04hX",
-                                                       descriptor->op.asl.aml_opcode);
+                                       acpi_os_printf("aml_opcode %04hX",
+                                                      descriptor->op.asl.
+                                                      aml_opcode);
                                        break;
 
                                case ACPI_DESC_TYPE_NAMED:
-                                       acpi_os_printf ("%4.4s",
-                                                       acpi_ut_get_node_name (&descriptor->node));
+                                       acpi_os_printf("%4.4s",
+                                                      acpi_ut_get_node_name
+                                                      (&descriptor->node));
                                        break;
 
                                default:
                                        break;
                                }
 
-                               acpi_os_printf ( "\n");
+                               acpi_os_printf("\n");
                                num_outstanding++;
                        }
                }
                element = element->next;
        }
 
-       (void) acpi_ut_release_mutex (ACPI_MTX_MEMORY);
+       (void)acpi_ut_release_mutex(ACPI_MTX_MEMORY);
 
        /* Print summary */
 
        if (!num_outstanding) {
-               ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                       "No outstanding allocations.\n"));
-       }
-       else {
-               ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                       "%d(%X) Outstanding allocations\n",
-                       num_outstanding, num_outstanding));
+               ACPI_INFO((AE_INFO, "No outstanding allocations"));
+       } else {
+               ACPI_ERROR((AE_INFO,
+                           "%d(%X) Outstanding allocations",
+                           num_outstanding, num_outstanding));
        }
 
        return_VOID;
 }
 
-
-#endif  /* #ifdef ACPI_DBG_TRACK_ALLOCATIONS */
-
+#endif                         /* #ifdef ACPI_DBG_TRACK_ALLOCATIONS */