7 files changed, 115 insertions, 114 deletions

diff --git a/drivers/acpi/dispatcher/dsinit.c b/drivers/acpi/dispatcher/dsinit.c
index d7790db50178..bcd1d472b90f 100644
--- a/drivers/acpi/dispatcher/dsinit.c
+++ b/drivers/acpi/dispatcher/dsinit.c
@@ -86,20 +86,20 @@ acpi_ds_init_one_object (
         void                            *context,
         void                            **return_value)
 {
+        struct acpi_init_walk_info      *info = (struct acpi_init_walk_info *) context;
+        struct acpi_namespace_node      *node = (struct acpi_namespace_node *) obj_handle;
         acpi_object_type                type;
         acpi_status                     status;
-        struct acpi_init_walk_info      *info = (struct acpi_init_walk_info *) context;
 
 
         ACPI_FUNCTION_NAME ("ds_init_one_object");
 
 
         /*
-         * We are only interested in objects owned by the table that
+         * We are only interested in NS nodes owned by the table that
          * was just loaded
          */
-        if (((struct acpi_namespace_node *) obj_handle)->owner_id !=
-                        info->table_desc->table_id) {
+        if (node->owner_id != info->table_desc->owner_id) {
                 return (AE_OK);
         }
 
@@ -126,8 +126,6 @@ acpi_ds_init_one_object (
 
         case ACPI_TYPE_METHOD:
 
-                info->method_count++;
-
                 /*
                  * Print a dot for each method unless we are going to print
                  * the entire pathname
@@ -143,7 +141,7 @@ acpi_ds_init_one_object (
                  * on a per-table basis. Currently, we just use a global for the width.
                  */
                 if (info->table_desc->pointer->revision == 1) {
-                        ((struct acpi_namespace_node *) obj_handle)->flags |= ANOBJ_DATA_WIDTH_32;
+                        node->flags |= ANOBJ_DATA_WIDTH_32;
                 }
 
                 /*
@@ -153,22 +151,14 @@ acpi_ds_init_one_object (
                 status = acpi_ds_parse_method (obj_handle);
                 if (ACPI_FAILURE (status)) {
                         ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                "Method %p [%4.4s] - parse failure, %s\n",
+                                "\n+Method %p [%4.4s] - parse failure, %s\n",
                                 obj_handle, acpi_ut_get_node_name (obj_handle),
                                 acpi_format_exception (status)));
 
                         /* This parse failed, but we will continue parsing more methods */
-
-                        break;
                 }
 
-                /*
-                 * Delete the parse tree.  We simply re-parse the method
-                 * for every execution since there isn't much overhead
-                 */
-                acpi_ns_delete_namespace_subtree (obj_handle);
-                acpi_ns_delete_namespace_by_owner (
-                        ((struct acpi_namespace_node *) obj_handle)->object->method.owning_id);
+                info->method_count++;
                 break;
 
 
@@ -237,7 +227,7 @@ acpi_ds_initialize_objects (
 
         ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT,
                 "\nTable [%4.4s](id %4.4X) - %hd Objects with %hd Devices %hd Methods %hd Regions\n",
-                table_desc->pointer->signature, table_desc->table_id, info.object_count,
+                table_desc->pointer->signature, table_desc->owner_id, info.object_count,
                 info.device_count, info.method_count, info.op_region_count));
 
         ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index 9fc3f4c033eb..e344c06ed33f 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.c
@@ -58,12 +58,11 @@
  *
  * FUNCTION:    acpi_ds_parse_method
  *
- * PARAMETERS:  obj_handle      - Method node
+ * PARAMETERS:  Node        - Method node
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Call the parser and parse the AML that is associated with the
- *              method.
+ * DESCRIPTION: Parse the AML that is associated with the method.
  *
  * MUTEX:       Assumes parser is locked
  *
@@ -71,31 +70,28 @@
 
 acpi_status
 acpi_ds_parse_method (
-        acpi_handle                     obj_handle)
+        struct acpi_namespace_node      *node)
 {
         acpi_status                     status;
         union acpi_operand_object       *obj_desc;
         union acpi_parse_object         *op;
-        struct acpi_namespace_node      *node;
-        acpi_owner_id                   owner_id;
         struct acpi_walk_state          *walk_state;
 
 
-        ACPI_FUNCTION_TRACE_PTR ("ds_parse_method", obj_handle);
+        ACPI_FUNCTION_TRACE_PTR ("ds_parse_method", node);
 
 
         /* Parameter Validation */
 
-        if (!obj_handle) {
+        if (!node) {
                 return_ACPI_STATUS (AE_NULL_ENTRY);
         }
 
         ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "**** Parsing [%4.4s] **** named_obj=%p\n",
-                acpi_ut_get_node_name (obj_handle), obj_handle));
+                acpi_ut_get_node_name (node), node));
 
         /* Extract the method object from the method Node */
 
-        node = (struct acpi_namespace_node *) obj_handle;
         obj_desc = acpi_ns_get_attached_object (node);
         if (!obj_desc) {
                 return_ACPI_STATUS (AE_NULL_OBJECT);
@@ -132,14 +128,18 @@ acpi_ds_parse_method (
          * objects (such as Operation Regions) can be created during the
          * first pass parse.
          */
-        owner_id = acpi_ut_allocate_owner_id (ACPI_OWNER_TYPE_METHOD);
-        obj_desc->method.owning_id = owner_id;
+        status = acpi_ut_allocate_owner_id (&obj_desc->method.owner_id);
+        if (ACPI_FAILURE (status)) {
+                goto cleanup;
+        }
 
         /* Create and initialize a new walk state */
 
-        walk_state = acpi_ds_create_walk_state (owner_id, NULL, NULL, NULL);
+        walk_state = acpi_ds_create_walk_state (
+                          obj_desc->method.owner_id, NULL, NULL, NULL);
         if (!walk_state) {
-                return_ACPI_STATUS (AE_NO_MEMORY);
+                status = AE_NO_MEMORY;
+                goto cleanup2;
         }
 
         status = acpi_ds_init_aml_walk (walk_state, op, node,
@@ -147,7 +147,7 @@ acpi_ds_parse_method (
                           obj_desc->method.aml_length, NULL, 1);
         if (ACPI_FAILURE (status)) {
                 acpi_ds_delete_walk_state (walk_state);
-                return_ACPI_STATUS (status);
+                goto cleanup2;
         }
 
         /*
@@ -161,13 +161,25 @@ acpi_ds_parse_method (
          */
         status = acpi_ps_parse_aml (walk_state);
         if (ACPI_FAILURE (status)) {
-                return_ACPI_STATUS (status);
+                goto cleanup2;
         }
 
         ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
                 "**** [%4.4s] Parsed **** named_obj=%p Op=%p\n",
-                acpi_ut_get_node_name (obj_handle), obj_handle, op));
+                acpi_ut_get_node_name (node), node, op));
+
+        /*
+         * Delete the parse tree. We simply re-parse the method for every
+         * execution since there isn't much overhead (compared to keeping lots
+         * of parse trees around)
+         */
+        acpi_ns_delete_namespace_subtree (node);
+        acpi_ns_delete_namespace_by_owner (obj_desc->method.owner_id);
+
+cleanup2:
+        acpi_ut_release_owner_id (&obj_desc->method.owner_id);
 
+cleanup:
         acpi_ps_delete_parse_tree (op);
         return_ACPI_STATUS (status);
 }
@@ -263,7 +275,7 @@ acpi_ds_call_control_method (
 {
         acpi_status                     status;
         struct acpi_namespace_node      *method_node;
-        struct acpi_walk_state          *next_walk_state;
+        struct acpi_walk_state          *next_walk_state = NULL;
         union acpi_operand_object       *obj_desc;
         struct acpi_parameter_info      info;
         u32                             i;
@@ -287,20 +299,23 @@ acpi_ds_call_control_method (
                 return_ACPI_STATUS (AE_NULL_OBJECT);
         }
 
-        obj_desc->method.owning_id = acpi_ut_allocate_owner_id (ACPI_OWNER_TYPE_METHOD);
+        status = acpi_ut_allocate_owner_id (&obj_desc->method.owner_id);
+        if (ACPI_FAILURE (status)) {
+                return_ACPI_STATUS (status);
+        }
 
         /* Init for new method, wait on concurrency semaphore */
 
         status = acpi_ds_begin_method_execution (method_node, obj_desc,
                           this_walk_state->method_node);
         if (ACPI_FAILURE (status)) {
-                return_ACPI_STATUS (status);
+                goto cleanup;
         }
 
         if (!(obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY)) {
                 /* 1) Parse: Create a new walk state for the preempting walk */
 
-                next_walk_state = acpi_ds_create_walk_state (obj_desc->method.owning_id,
+                next_walk_state = acpi_ds_create_walk_state (obj_desc->method.owner_id,
                                   op, obj_desc, NULL);
                 if (!next_walk_state) {
                         return_ACPI_STATUS (AE_NO_MEMORY);
@@ -330,7 +345,7 @@ acpi_ds_call_control_method (
 
         /* 2) Execute: Create a new state for the preempting walk */
 
-        next_walk_state = acpi_ds_create_walk_state (obj_desc->method.owning_id,
+        next_walk_state = acpi_ds_create_walk_state (obj_desc->method.owner_id,
                           NULL, obj_desc, thread);
         if (!next_walk_state) {
                 status = AE_NO_MEMORY;
@@ -381,6 +396,7 @@ acpi_ds_call_control_method (
         /* On error, we must delete the new walk state */
 
 cleanup:
+        acpi_ut_release_owner_id (&obj_desc->method.owner_id);
         if (next_walk_state && (next_walk_state->method_desc)) {
                 /* Decrement the thread count on the method parse tree */
 
@@ -552,8 +568,7 @@ acpi_ds_terminate_control_method (
                  */
                 if ((walk_state->method_desc->method.concurrency == 1) &&
                         (!walk_state->method_desc->method.semaphore)) {
-                        status = acpi_os_create_semaphore (1,
-                                         1,
+                        status = acpi_os_create_semaphore (1, 1,
                                          &walk_state->method_desc->method.semaphore);
                 }
 
@@ -582,8 +597,10 @@ acpi_ds_terminate_control_method (
                  * Delete any namespace entries created anywhere else within
                  * the namespace
                  */
-                acpi_ns_delete_namespace_by_owner (walk_state->method_desc->method.owning_id);
+                acpi_ns_delete_namespace_by_owner (walk_state->method_desc->method.owner_id);
                 status = acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
+                acpi_ut_release_owner_id (&walk_state->method_desc->method.owner_id);
+
                 if (ACPI_FAILURE (status)) {
                         return_ACPI_STATUS (status);
                 }
diff --git a/drivers/acpi/dispatcher/dsmthdat.c b/drivers/acpi/dispatcher/dsmthdat.c
index f7998306f756..c83d53fd6398 100644
--- a/drivers/acpi/dispatcher/dsmthdat.c
+++ b/drivers/acpi/dispatcher/dsmthdat.c
@@ -633,22 +633,11 @@ acpi_ds_store_object_to_local (
                  */
                 if (opcode == AML_ARG_OP) {
                         /*
-                         * Make sure that the object is the correct type.  This may be
-                         * overkill, butit is here because references were NS nodes in
-                         *  the past.  Now they are operand objects of type Reference.
-                         */
-                        if (ACPI_GET_DESCRIPTOR_TYPE (current_obj_desc) != ACPI_DESC_TYPE_OPERAND) {
-                                ACPI_REPORT_ERROR ((
-                                        "Invalid descriptor type while storing to method arg: [%s]\n",
-                                        acpi_ut_get_descriptor_name (current_obj_desc)));
-                                return_ACPI_STATUS (AE_AML_INTERNAL);
-                        }
-
-                        /*
                          * If we have a valid reference object that came from ref_of(),
                          * do the indirect store
                          */
-                        if ((current_obj_desc->common.type == ACPI_TYPE_LOCAL_REFERENCE) &&
+                        if ((ACPI_GET_DESCRIPTOR_TYPE (current_obj_desc) == ACPI_DESC_TYPE_OPERAND) &&
+                                (current_obj_desc->common.type == ACPI_TYPE_LOCAL_REFERENCE) &&
                                 (current_obj_desc->reference.opcode == AML_REF_OF_OP)) {
                                 ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
                                                 "Arg (%p) is an obj_ref(Node), storing in node %p\n",
diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c
index bfbae4e4c667..1eee2d54180f 100644
--- a/drivers/acpi/dispatcher/dsobject.c
+++ b/drivers/acpi/dispatcher/dsobject.c
@@ -547,6 +547,9 @@ acpi_ds_init_object_from_op (
                 case AML_TYPE_LITERAL:
 
                         obj_desc->integer.value = op->common.value.integer;
+#ifndef ACPI_NO_METHOD_EXECUTION
+                        acpi_ex_truncate_for32bit_table (obj_desc);
+#endif
                         break;
 
 
diff --git a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c
index ba13bca28bee..750bdb1ac344 100644
--- a/drivers/acpi/dispatcher/dsopcode.c
+++ b/drivers/acpi/dispatcher/dsopcode.c
@@ -119,14 +119,15 @@ acpi_ds_execute_arguments (
 
         walk_state = acpi_ds_create_walk_state (0, NULL, NULL, NULL);
         if (!walk_state) {
-                return_ACPI_STATUS (AE_NO_MEMORY);
+                status = AE_NO_MEMORY;
+                goto cleanup;
         }
 
         status = acpi_ds_init_aml_walk (walk_state, op, NULL, aml_start,
                           aml_length, NULL, 1);
         if (ACPI_FAILURE (status)) {
                 acpi_ds_delete_walk_state (walk_state);
-                return_ACPI_STATUS (status);
+                goto cleanup;
         }
 
         /* Mark this parse as a deferred opcode */
@@ -138,8 +139,7 @@ acpi_ds_execute_arguments (
 
         status = acpi_ps_parse_aml (walk_state);
         if (ACPI_FAILURE (status)) {
-                acpi_ps_delete_parse_tree (op);
-                return_ACPI_STATUS (status);
+                goto cleanup;
         }
 
         /* Get and init the Op created above */
@@ -160,7 +160,8 @@ acpi_ds_execute_arguments (
 
         walk_state = acpi_ds_create_walk_state (0, NULL, NULL, NULL);
         if (!walk_state) {
-                return_ACPI_STATUS (AE_NO_MEMORY);
+                status = AE_NO_MEMORY;
+                goto cleanup;
         }
 
         /* Execute the opcode and arguments */
@@ -169,13 +170,15 @@ acpi_ds_execute_arguments (
                           aml_length, NULL, 3);
         if (ACPI_FAILURE (status)) {
                 acpi_ds_delete_walk_state (walk_state);
-                return_ACPI_STATUS (status);
+                goto cleanup;
         }
 
         /* Mark this execution as a deferred opcode */
 
         walk_state->deferred_node = node;
         status = acpi_ps_parse_aml (walk_state);
+
+cleanup:
         acpi_ps_delete_parse_tree (op);
         return_ACPI_STATUS (status);
 }
diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index d11620018421..9100c0bda470 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -50,7 +50,7 @@
 #include <acpi/acnamesp.h>
 #include <acpi/acevents.h>
 
-#ifdef _ACPI_ASL_COMPILER
+#ifdef ACPI_ASL_COMPILER
 #include <acpi/acdisasm.h>
 #endif
 
@@ -145,15 +145,6 @@ acpi_ds_load1_begin_op (
 
         if (op) {
                 if (!(walk_state->op_info->flags & AML_NAMED)) {
-#if 0
-                        if ((walk_state->op_info->class == AML_CLASS_EXECUTE) ||
-                                (walk_state->op_info->class == AML_CLASS_CONTROL)) {
-                                acpi_os_printf ("\n\n***EXECUTABLE OPCODE %s***\n\n",
-                                        walk_state->op_info->name);
-                                *out_op = op;
-                                return (AE_CTRL_SKIP);
-                        }
-#endif
                         *out_op = op;
                         return (AE_OK);
                 }
@@ -185,7 +176,7 @@ acpi_ds_load1_begin_op (
                  */
                 status = acpi_ns_lookup (walk_state->scope_info, path, object_type,
                                   ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT, walk_state, &(node));
-#ifdef _ACPI_ASL_COMPILER
+#ifdef ACPI_ASL_COMPILER
                 if (status == AE_NOT_FOUND) {
                         /*
                          * Table disassembly:
@@ -486,11 +477,31 @@ acpi_ds_load2_begin_op (
         ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Op=%p State=%p\n", op, walk_state));
 
         if (op) {
+                if ((walk_state->control_state) &&
+                        (walk_state->control_state->common.state ==
+                                ACPI_CONTROL_CONDITIONAL_EXECUTING)) {
+                        /* We are executing a while loop outside of a method */
+
+                        status = acpi_ds_exec_begin_op (walk_state, out_op);
+                        return_ACPI_STATUS (status);
+                }
+
                 /* We only care about Namespace opcodes here */
 
                 if ((!(walk_state->op_info->flags & AML_NSOPCODE) &&
                           (walk_state->opcode != AML_INT_NAMEPATH_OP)) ||
                         (!(walk_state->op_info->flags & AML_NAMED))) {
+                        if ((walk_state->op_info->class == AML_CLASS_EXECUTE) ||
+                                (walk_state->op_info->class == AML_CLASS_CONTROL)) {
+                                ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
+                                        "Begin/EXEC: %s (fl %8.8X)\n", walk_state->op_info->name,
+                                        walk_state->op_info->flags));
+
+                                /* Executing a type1 or type2 opcode outside of a method */
+
+                                status = acpi_ds_exec_begin_op (walk_state, out_op);
+                                return_ACPI_STATUS (status);
+                        }
                         return_ACPI_STATUS (AE_OK);
                 }
 
@@ -558,7 +569,7 @@ acpi_ds_load2_begin_op (
                                   ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT,
                                   walk_state, &(node));
                 if (ACPI_FAILURE (status)) {
-#ifdef _ACPI_ASL_COMPILER
+#ifdef ACPI_ASL_COMPILER
                         if (status == AE_NOT_FOUND) {
                                 status = AE_OK;
                         }
@@ -651,8 +662,10 @@ acpi_ds_load2_begin_op (
                         break;
                 }
 
+                /* Add new entry into namespace */
+
                 status = acpi_ns_lookup (walk_state->scope_info, buffer_ptr, object_type,
-                                  ACPI_IMODE_EXECUTE, ACPI_NS_NO_UPSEARCH,
+                                  ACPI_IMODE_LOAD_PASS2, ACPI_NS_NO_UPSEARCH,
                                   walk_state, &(node));
                 break;
         }
@@ -662,7 +675,6 @@ acpi_ds_load2_begin_op (
                 return_ACPI_STATUS (status);
         }
 
-
         if (!op) {
                 /* Create a new op */
 
@@ -676,9 +688,7 @@ acpi_ds_load2_begin_op (
                 if (node) {
                         op->named.name = node->name.integer;
                 }
-                if (out_op) {
-                        *out_op = op;
-                }
+                *out_op = op;
         }
 
         /*
@@ -725,9 +735,24 @@ acpi_ds_load2_end_op (
         ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Opcode [%s] Op %p State %p\n",
                         walk_state->op_info->name, op, walk_state));
 
-        /* Only interested in opcodes that have namespace objects */
+        /* Check if opcode had an associated namespace object */
 
         if (!(walk_state->op_info->flags & AML_NSOBJECT)) {
+#ifndef ACPI_NO_METHOD_EXECUTION
+                /* No namespace object. Executable opcode? */
+
+                if ((walk_state->op_info->class == AML_CLASS_EXECUTE) ||
+                        (walk_state->op_info->class == AML_CLASS_CONTROL)) {
+                        ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
+                                "End/EXEC:   %s (fl %8.8X)\n", walk_state->op_info->name,
+                                walk_state->op_info->flags));
+
+                        /* Executing a type1 or type2 opcode outside of a method */
+
+                        status = acpi_ds_exec_end_op (walk_state);
+                        return_ACPI_STATUS (status);
+                }
+#endif
                 return_ACPI_STATUS (AE_OK);
         }
 
@@ -736,7 +761,6 @@ acpi_ds_load2_end_op (
                         "Ending scope Op=%p State=%p\n", op, walk_state));
         }
 
-
         object_type = walk_state->op_info->object_type;
 
         /*
@@ -959,6 +983,7 @@ acpi_ds_load2_end_op (
                                   ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE,
                                   walk_state, &(new_node));
                 if (ACPI_SUCCESS (status)) {
+
                         /*
                          * Make sure that what we found is indeed a method
                          * We didn't search for a method on purpose, to see if the name
diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 9cd3db652b31..5621665991b5 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -261,12 +261,12 @@ acpi_ds_result_pop_from_bottom (
 
         if (!*object) {
                 ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                        "Null operand! State=%p #Ops=%X, Index=%X\n",
+                        "Null operand! State=%p #Ops=%X Index=%X\n",
                         walk_state, state->results.num_results, (u32) index));
                 return (AE_AML_NO_RETURN_VALUE);
         }
 
-        ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Obj=%p [%s], Results=%p State=%p\n",
+        ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Obj=%p [%s] Results=%p State=%p\n",
                 *object, (*object) ? acpi_ut_get_object_type_name (*object) : "NULL",
                 state, walk_state));
 
@@ -681,7 +681,7 @@ acpi_ds_create_walk_state (
         ACPI_FUNCTION_TRACE ("ds_create_walk_state");
 
 
-        walk_state = acpi_ut_acquire_from_cache (ACPI_MEM_LIST_WALK);
+        walk_state = ACPI_MEM_CALLOCATE (sizeof (struct acpi_walk_state));
         if (!walk_state) {
                 return_PTR (NULL);
         }
@@ -704,7 +704,7 @@ acpi_ds_create_walk_state (
 
         status = acpi_ds_result_stack_push (walk_state);
         if (ACPI_FAILURE (status)) {
-                acpi_ut_release_to_cache (ACPI_MEM_LIST_WALK, walk_state);
+                ACPI_MEM_FREE (walk_state);
                 return_PTR (NULL);
         }
 
@@ -744,7 +744,7 @@ acpi_ds_init_aml_walk (
         u8                              *aml_start,
         u32                             aml_length,
         struct acpi_parameter_info      *info,
-        u32                             pass_number)
+        u8                              pass_number)
 {
         acpi_status                     status;
         struct acpi_parse_state         *parser_state = &walk_state->parser_state;
@@ -762,6 +762,7 @@ acpi_ds_init_aml_walk (
         /* The next_op of the next_walk will be the beginning of the method */
 
         walk_state->next_op = NULL;
+        walk_state->pass_number = pass_number;
 
         if (info) {
                 if (info->parameter_type == ACPI_PARAM_GPE) {
@@ -899,38 +900,11 @@ acpi_ds_delete_walk_state (
                 acpi_ut_delete_generic_state (state);
         }
 
-        acpi_ut_release_to_cache (ACPI_MEM_LIST_WALK, walk_state);
+        ACPI_MEM_FREE (walk_state);
         return_VOID;
 }
 
 
-#ifdef ACPI_ENABLE_OBJECT_CACHE
-/******************************************************************************
- *
- * FUNCTION:    acpi_ds_delete_walk_state_cache
- *
- * PARAMETERS:  None
- *
- * RETURN:      None
- *
- * DESCRIPTION: Purge the global state object cache.  Used during subsystem
- *              termination.
- *
- ******************************************************************************/
-
-void
-acpi_ds_delete_walk_state_cache (
-        void)
-{
-        ACPI_FUNCTION_TRACE ("ds_delete_walk_state_cache");
-
-
-        acpi_ut_delete_generic_cache (ACPI_MEM_LIST_WALK);
-        return_VOID;
-}
-#endif
-
-
 #ifdef ACPI_OBSOLETE_FUNCTIONS
 /*******************************************************************************
  *