[ACPI] ACPICA 20060127

Implemented support in the Resource Manager to allow
unresolved namestring references within resource package
objects for the _PRT method. This support is in addition
to the previously implemented unresolved reference
support within the AML parser. If the interpreter slack
mode is enabled (true on Linux unless acpi=strict),
these unresolved references will be passed through
to the caller as a NULL package entry.
http://bugzilla.kernel.org/show_bug.cgi?id=5741

Implemented and deployed new macros and functions for
error and warning messages across the subsystem. These
macros are simpler and generate less code than their
predecessors. The new macros ACPI_ERROR, ACPI_EXCEPTION,
ACPI_WARNING, and ACPI_INFO replace the ACPI_REPORT_*
macros.

Implemented the acpi_cpu_flags type to simplify host OS
integration of the Acquire/Release Lock OSL interfaces.
Suggested by Steven Rostedt and Andrew Morton.

Fixed a problem where Alias ASL operators are sometimes
not correctly resolved. causing AE_AML_INTERNAL
http://bugzilla.kernel.org/show_bug.cgi?id=5189
http://bugzilla.kernel.org/show_bug.cgi?id=5674

Fixed several problems with the implementation of the
ConcatenateResTemplate ASL operator. As per the ACPI
specification, zero length buffers are now treated as a
single EndTag. One-length buffers always cause a fatal
exception. Non-zero length buffers that do not end with
a full 2-byte EndTag cause a fatal exception.

Fixed a possible structure overwrite in the
AcpiGetObjectInfo external interface. (With assistance
from Thomas Renninger)

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

1 files changed, 17 insertions, 9 deletions

diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index 4cad6afa82f7..d3d24da31c81 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -187,7 +187,7 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
                 }
 #endif
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_NSERROR(path, status);
+                        ACPI_ERROR_NAMESPACE(path, status);
                         return_ACPI_STATUS(status);
                 }
 
@@ -233,7 +233,9 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
 
                         /* All other types are an error */
 
-                        ACPI_REPORT_ERROR(("Invalid type (%s) for target of Scope operator [%4.4s] (Cannot override)\n", acpi_ut_get_type_name(node->type), path));
+                        ACPI_ERROR((AE_INFO,
+                                    "Invalid type (%s) for target of Scope operator [%4.4s] (Cannot override)",
+                                    acpi_ut_get_type_name(node->type), path));
 
                         return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
@@ -300,7 +302,7 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
                                    ACPI_IMODE_LOAD_PASS1, flags, walk_state,
                                    &(node));
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_NSERROR(path, status);
+                        ACPI_ERROR_NAMESPACE(path, status);
                         return_ACPI_STATUS(status);
                 }
                 break;
@@ -618,10 +620,10 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
                         if (status == AE_NOT_FOUND) {
                                 status = AE_OK;
                         } else {
-                                ACPI_REPORT_NSERROR(buffer_ptr, status);
+                                ACPI_ERROR_NAMESPACE(buffer_ptr, status);
                         }
 #else
-                        ACPI_REPORT_NSERROR(buffer_ptr, status);
+                        ACPI_ERROR_NAMESPACE(buffer_ptr, status);
 #endif
                         return_ACPI_STATUS(status);
                 }
@@ -651,7 +653,10 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
                          *  Scope (DEB) { ... }
                          */
 
-                        ACPI_REPORT_WARNING(("Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)\n", buffer_ptr, acpi_ut_get_type_name(node->type)));
+                        ACPI_WARNING((AE_INFO,
+                                      "Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)",
+                                      buffer_ptr,
+                                      acpi_ut_get_type_name(node->type)));
 
                         node->type = ACPI_TYPE_ANY;
                         walk_state->scope_info->common.value = ACPI_TYPE_ANY;
@@ -661,7 +666,10 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
 
                         /* All other types are an error */
 
-                        ACPI_REPORT_ERROR(("Invalid type (%s) for target of Scope operator [%4.4s]\n", acpi_ut_get_type_name(node->type), buffer_ptr));
+                        ACPI_ERROR((AE_INFO,
+                                    "Invalid type (%s) for target of Scope operator [%4.4s]",
+                                    acpi_ut_get_type_name(node->type),
+                                    buffer_ptr));
 
                         return (AE_AML_OPERAND_TYPE);
                 }
@@ -714,7 +722,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
         }
 
         if (ACPI_FAILURE(status)) {
-                ACPI_REPORT_NSERROR(buffer_ptr, status);
+                ACPI_ERROR_NAMESPACE(buffer_ptr, status);
                 return_ACPI_STATUS(status);
         }
 
@@ -1112,7 +1120,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                          */
                         op->common.node = new_node;
                 } else {
-                        ACPI_REPORT_NSERROR(arg->common.value.string, status);
+                        ACPI_ERROR_NAMESPACE(arg->common.value.string, status);
                 }
                 break;