[ACPI] ACPICA 20050902

Fixed a problem with the internal Owner ID allocation and
deallocation mechanisms for control method execution and
recursive method invocation.  This should eliminate the
OWNER_ID_LIMIT exceptions and "Invalid OwnerId" messages
seen on some systems.  Recursive method invocation depth
is currently limited to 255.  (Alexey Starikovskiy)

http://bugzilla.kernel.org/show_bug.cgi?id=4892

Completely eliminated all vestiges of support for the
"module-level executable code" until this support is
fully implemented and debugged.  This should eliminate the
NO_RETURN_VALUE exceptions seen during table load on some
systems that invoke this support.

http://bugzilla.kernel.org/show_bug.cgi?id=5162

Fixed a problem within the resource manager code where
the transaction flags for a 64-bit address descriptor were
handled incorrectly in the type-specific flag byte.

Consolidated duplicate code within the address descriptor
resource manager code, reducing overall subsystem code size.

Signed-off-by: Robert Moore <Robert.Moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index 362bbcfc1718..411731261c29 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -486,8 +486,10 @@ 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,
@@ -499,6 +501,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state * walk_state,
                                     acpi_ds_exec_begin_op(walk_state, out_op);
                                 return_ACPI_STATUS(status);
                         }
+#endif
                         return_ACPI_STATUS(AE_OK);
                 }
 
@@ -731,6 +734,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
 
         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) ||
@@ -746,6 +750,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                         return_ACPI_STATUS(status);
                 }
 #endif
+#endif
                 return_ACPI_STATUS(AE_OK);
         }