[ACPI] ACPICA 20060317

Implemented the use of a cache object for all internal
namespace nodes. Since there are about 1000 static nodes
in a typical system, this will decrease memory use for
cache implementations that minimize per-allocation overhead
(such as a slab allocator.)

Removed the reference count mechanism for internal
namespace nodes, since it was deemed unnecessary. This
reduces the size of each namespace node by about 5%-10%
on all platforms. Nodes are now 20 bytes for the 32-bit
case, and 32 bytes for the 64-bit case.

Optimized several internal data structures to reduce
object size on 64-bit platforms by packing data within
the 64-bit alignment. This includes the frequently used
ACPI_OPERAND_OBJECT, of which there can be ~1000 static
instances corresponding to the namespace objects.

Added two new strings for the predefined _OSI method:
"Windows 2001.1 SP1" and "Windows 2006".

Split the allocation tracking mechanism out to a separate
file, from utalloc.c to uttrack.c. This mechanism appears
to be only useful for application-level code. Kernels may
wish to not include uttrack.c in distributions.

Removed all remnants of the obsolete ACPI_REPORT_* macros
and the associated code. (These macros have been replaced
by the ACPI_ERROR and ACPI_WARNING macros.)

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

3 files changed, 9 insertions, 11 deletions

diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c
index e8e72986f0d6..4e90c1f837c3 100644
--- a/drivers/acpi/events/evgpeblk.c
+++ b/drivers/acpi/events/evgpeblk.c
@@ -131,7 +131,7 @@ u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info)
  *
  ******************************************************************************/
 
-acpi_status acpi_ev_walk_gpe_list(ACPI_GPE_CALLBACK gpe_walk_callback)
+acpi_status acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback)
 {
         struct acpi_gpe_block_info *gpe_block;
         struct acpi_gpe_xrupt_info *gpe_xrupt_info;
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c
index 334407239f2f..b216b3229e27 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/events/evmisc.c
@@ -185,7 +185,8 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
                         return (AE_NO_MEMORY);
                 }
 
-                notify_info->common.data_type = ACPI_DESC_TYPE_STATE_NOTIFY;
+                notify_info->common.descriptor_type =
+                    ACPI_DESC_TYPE_STATE_NOTIFY;
                 notify_info->notify.node = node;
                 notify_info->notify.value = (u16) notify_value;
                 notify_info->notify.handler_obj = handler_obj;
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index 2b900ef05fa9..0337ad222b26 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.c
@@ -250,7 +250,6 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
 
       cleanup:
         acpi_ut_remove_reference(params[0]);
-
         return_ACPI_STATUS(status);
 }
 
@@ -389,9 +388,8 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                           acpi_ut_get_region_name(region_obj->region.
                                                   space_id)));
 
-        if (!
-            (handler_desc->address_space.
-             hflags & ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {
+        if (!(handler_desc->address_space.handler_flags &
+              ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {
                 /*
                  * For handlers other than the default (supplied) handlers, we must
                  * exit the interpreter because the handler *might* block -- we don't
@@ -412,9 +410,8 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                                                         space_id)));
         }
 
-        if (!
-            (handler_desc->address_space.
-             hflags & ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {
+        if (!(handler_desc->address_space.handler_flags &
+              ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {
                 /*
                  * We just returned from a non-default handler, we must re-enter the
                  * interpreter
@@ -772,7 +769,7 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
         union acpi_operand_object *handler_obj;
         acpi_status status;
         acpi_object_type type;
-        u16 flags = 0;
+        u8 flags = 0;
 
         ACPI_FUNCTION_TRACE("ev_install_space_handler");
 
@@ -930,7 +927,7 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
         /* Init handler obj */
 
         handler_obj->address_space.space_id = (u8) space_id;
-        handler_obj->address_space.hflags = flags;
+        handler_obj->address_space.handler_flags = flags;
         handler_obj->address_space.region_list = NULL;
         handler_obj->address_space.node = node;
         handler_obj->address_space.handler = handler;