3 files changed, 9 insertions, 13 deletions

diff --git a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c
index 408500648114..ae6cad85e015 100644
--- a/drivers/acpi/executer/exdump.c
+++ b/drivers/acpi/executer/exdump.c
@@ -51,6 +51,11 @@
 #define _COMPONENT          ACPI_EXECUTER
          ACPI_MODULE_NAME    ("exdump")
 
+/*
+ * The following routines are used for debug output only
+ */
+#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
+
 /* Local prototypes */
 
 #ifdef ACPI_FUTURE_USAGE
@@ -76,11 +81,6 @@ acpi_ex_out_address (
 #endif  /* ACPI_FUTURE_USAGE */
 
 
-/*
- * The following routines are used for debug output only
- */
-#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ex_dump_operand
@@ -118,7 +118,7 @@ acpi_ex_dump_operand (
         }
 
         if (ACPI_GET_DESCRIPTOR_TYPE (obj_desc) == ACPI_DESC_TYPE_NAMED) {
-                ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%p is a NS Node: ", obj_desc));
+                ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%p Namespace Node: ", obj_desc));
                 ACPI_DUMP_ENTRY (obj_desc, ACPI_LV_EXEC);
                 return;
         }
@@ -467,7 +467,7 @@ acpi_ex_dump_operands (
         }
 
         ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
-                "************* Stack dump from %s(%d), %s\n",
+                "************* Operand Stack dump from %s(%d), %s\n",
                 module_name, line_number, note));
         return;
 }
diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index 2725db0901b8..763ffeea8503 100644
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.c
@@ -574,7 +574,7 @@ acpi_ex_store_object_to_node (
 
         /* If no implicit conversion, drop into the default case below */
 
-        if (!implicit_conversion) {
+        if ((!implicit_conversion) || (walk_state->opcode == AML_COPY_OP)) {
                 /* Force execution of default (no implicit conversion) */
 
                 target_type = ACPI_TYPE_ANY;
@@ -634,7 +634,7 @@ acpi_ex_store_object_to_node (
         default:
 
                 ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
-                        "Storing %s (%p) directly into node (%p), no implicit conversion\n",
+                        "Storing %s (%p) directly into node (%p) with no implicit conversion\n",
                         acpi_ut_get_object_type_name (source_desc), source_desc, node));
 
                 /* No conversions for all other types.  Just attach the source object */
diff --git a/drivers/acpi/executer/exstoren.c b/drivers/acpi/executer/exstoren.c
index 120f30ed0bd4..433588ab432a 100644
--- a/drivers/acpi/executer/exstoren.c
+++ b/drivers/acpi/executer/exstoren.c
@@ -265,10 +265,6 @@ acpi_ex_store_object_to_object (
 
         case ACPI_TYPE_BUFFER:
 
-                /*
-                 * Note: There is different store behavior depending on the original
-                 * source type
-                 */
                 status = acpi_ex_store_buffer_to_buffer (actual_src_desc, dest_desc);
                 break;