1 files changed, 7 insertions, 34 deletions

diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c
index 3023ceaa8d5..6de3a99d4cd 100644
--- a/drivers/acpi/acpica/dswload.c
+++ b/drivers/acpi/acpica/dswload.c
@@ -581,21 +581,6 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
                 if ((!(walk_state->op_info->flags & AML_NSOPCODE) &&
                      (walk_state->opcode != AML_INT_NAMEPATH_OP)) ||
                     (!(walk_state->op_info->flags & AML_NAMED))) {
-#ifdef ACPI_ENABLE_MODULE_LEVEL_CODE
-                        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);
-                        }
-#endif
                         return_ACPI_STATUS(AE_OK);
                 }
 
@@ -768,7 +753,13 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
 
                         /* Execution mode, node cannot already exist, node is temporary */
 
-                        flags |= (ACPI_NS_ERROR_IF_FOUND | ACPI_NS_TEMPORARY);
+                        flags |= ACPI_NS_ERROR_IF_FOUND;
+
+                        if (!
+                            (walk_state->
+                             parse_flags & ACPI_PARSE_MODULE_LEVEL)) {
+                                flags |= ACPI_NS_TEMPORARY;
+                        }
                 }
 
                 /* Add new entry or lookup existing entry */
@@ -851,24 +842,6 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
         /* Check if opcode had an associated namespace object */
 
         if (!(walk_state->op_info->flags & AML_NSOBJECT)) {
-#ifndef ACPI_NO_METHOD_EXECUTION
-#ifdef ACPI_ENABLE_MODULE_LEVEL_CODE
-                /* 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
-#endif
                 return_ACPI_STATUS(AE_OK);
         }