3 files changed, 21 insertions, 17 deletions

diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c
index ece7a9dedd5c..9df0a64ba9e9 100644
--- a/drivers/acpi/namespace/nsaccess.c
+++ b/drivers/acpi/namespace/nsaccess.c
@@ -159,7 +159,7 @@ acpi_ns_root_initialize (
                                 obj_desc->method.param_count = (u8) ACPI_TO_INTEGER (val);
                                 obj_desc->common.flags |= AOPOBJ_DATA_VALID;
 
-#if defined (_ACPI_ASL_COMPILER) || defined (_ACPI_DUMP_App)
+#if defined (ACPI_ASL_COMPILER) || defined (ACPI_DUMP_App)
 
                                 /*
                                  * i_aSL Compiler cheats by putting parameter count
diff --git a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/namespace/nsalloc.c
index 5653a19d7172..3f94b0806ecf 100644
--- a/drivers/acpi/namespace/nsalloc.c
+++ b/drivers/acpi/namespace/nsalloc.c
@@ -83,7 +83,7 @@ acpi_ns_create_node (
                 return_PTR (NULL);
         }
 
-        ACPI_MEM_TRACKING (acpi_gbl_memory_lists[ACPI_MEM_LIST_NSNODE].total_allocated++);
+        ACPI_MEM_TRACKING (acpi_gbl_ns_node_list->total_allocated++);
 
         node->name.integer   = name;
         node->reference_count = 1;
@@ -151,7 +151,7 @@ acpi_ns_delete_node (
                 }
         }
 
-        ACPI_MEM_TRACKING (acpi_gbl_memory_lists[ACPI_MEM_LIST_NSNODE].total_freed++);
+        ACPI_MEM_TRACKING (acpi_gbl_ns_node_list->total_freed++);
 
         /*
          * Detach an object if there is one then delete the node
@@ -362,7 +362,7 @@ acpi_ns_delete_children (
 
                 /* Now we can free this child object */
 
-                ACPI_MEM_TRACKING (acpi_gbl_memory_lists[ACPI_MEM_LIST_NSNODE].total_freed++);
+                ACPI_MEM_TRACKING (acpi_gbl_ns_node_list->total_freed++);
 
                 ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, "Object %p, Remaining %X\n",
                         child_node, acpi_gbl_current_node_count));
diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index 05af95322a62..c9f35dd7a431 100644
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.c
@@ -208,33 +208,37 @@ acpi_ns_dump_one_object (
                 return (AE_OK);
         }
 
-        /* Indent the object according to the level */
+        if (!(info->display_type & ACPI_DISPLAY_SHORT)) {
+                /* Indent the object according to the level */
 
-        acpi_os_printf ("%2d%*s", (u32) level - 1, (int) level * 2, " ");
+                acpi_os_printf ("%2d%*s", (u32) level - 1, (int) level * 2, " ");
 
-        /* Check the node type and name */
+                /* Check the node type and name */
 
-        if (type > ACPI_TYPE_LOCAL_MAX) {
-                ACPI_REPORT_WARNING (("Invalid ACPI Type %08X\n", type));
-        }
+                if (type > ACPI_TYPE_LOCAL_MAX) {
+                        ACPI_REPORT_WARNING (("Invalid ACPI Type %08X\n", type));
+                }
+
+                if (!acpi_ut_valid_acpi_name (this_node->name.integer)) {
+                        ACPI_REPORT_WARNING (("Invalid ACPI Name %08X\n",
+                                this_node->name.integer));
+                }
 
-        if (!acpi_ut_valid_acpi_name (this_node->name.integer)) {
-                ACPI_REPORT_WARNING (("Invalid ACPI Name %08X\n",
-                        this_node->name.integer));
+                acpi_os_printf ("%4.4s", acpi_ut_get_node_name (this_node));
         }
 
         /*
          * Now we can print out the pertinent information
          */
-        acpi_os_printf ("%4.4s %-12s %p ",
-                        acpi_ut_get_node_name (this_node), acpi_ut_get_type_name (type), this_node);
+        acpi_os_printf (" %-12s %p ",
+                        acpi_ut_get_type_name (type), this_node);
 
         dbg_level = acpi_dbg_level;
         acpi_dbg_level = 0;
         obj_desc = acpi_ns_get_attached_object (this_node);
         acpi_dbg_level = dbg_level;
 
-        switch (info->display_type) {
+        switch (info->display_type & ACPI_DISPLAY_MASK) {
         case ACPI_DISPLAY_SUMMARY:
 
                 if (!obj_desc) {
@@ -646,7 +650,7 @@ acpi_ns_dump_entry (
 }
 
 
-#ifdef _ACPI_ASL_COMPILER
+#ifdef ACPI_ASL_COMPILER
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_dump_tables