16 files changed, 107 insertions, 63 deletions

diff --git a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c
index 651f2b68531b..e348db0e541e 100644
--- a/drivers/acpi/dispatcher/dsmethod.c
+++ b/drivers/acpi/dispatcher/dsmethod.c
@@ -385,6 +385,7 @@ acpi_ds_restart_control_method(struct acpi_walk_state *walk_state,
                                union acpi_operand_object *return_desc)
 {
         acpi_status status;
+        int same_as_implicit_return;
 
         ACPI_FUNCTION_TRACE_PTR(ds_restart_control_method, walk_state);
 
@@ -402,6 +403,11 @@ acpi_ds_restart_control_method(struct acpi_walk_state *walk_state,
 
         if (return_desc) {
 
+                /* Is the implicit return object the same as the return desc? */
+
+                same_as_implicit_return =
+                    (walk_state->implicit_return_obj == return_desc);
+
                 /* Are we actually going to use the return value? */
 
                 if (walk_state->return_used) {
@@ -422,18 +428,23 @@ acpi_ds_restart_control_method(struct acpi_walk_state *walk_state,
                 }
 
                 /*
-                 * The following code is the
-                 * optional support for a so-called "implicit return". Some AML code
-                 * assumes that the last value of the method is "implicitly" returned
-                 * to the caller. Just save the last result as the return value.
+                 * The following code is the optional support for the so-called
+                 * "implicit return". Some AML code assumes that the last value of the
+                 * method is "implicitly" returned to the caller, in the absence of an
+                 * explicit return value.
+                 *
+                 * Just save the last result of the method as the return value.
+                 *
                  * NOTE: this is optional because the ASL language does not actually
                  * support this behavior.
                  */
                 else if (!acpi_ds_do_implicit_return
-                         (return_desc, walk_state, FALSE)) {
+                         (return_desc, walk_state, FALSE)
+                         || same_as_implicit_return) {
                         /*
                          * Delete the return value if it will not be used by the
-                         * calling method
+                         * calling method or remove one reference if the explicit return
+                         * is the same as the implicit return value.
                          */
                         acpi_ut_remove_reference(return_desc);
                 }
diff --git a/drivers/acpi/dispatcher/dsmthdat.c b/drivers/acpi/dispatcher/dsmthdat.c
index b47c54fad86d..459160ff9058 100644
--- a/drivers/acpi/dispatcher/dsmthdat.c
+++ b/drivers/acpi/dispatcher/dsmthdat.c
@@ -336,7 +336,7 @@ acpi_ds_method_data_set_value(u16 opcode,
          * Increment ref count so object can't be deleted while installed.
          * NOTE: We do not copy the object in order to preserve the call by
          * reference semantics of ACPI Control Method invocation.
-         * (See ACPI specification 2.0_c)
+         * (See ACPI Specification 2.0_c)
          */
         acpi_ut_add_reference(object);
 
@@ -351,7 +351,7 @@ acpi_ds_method_data_set_value(u16 opcode,
  * FUNCTION:    acpi_ds_method_data_get_value
  *
  * PARAMETERS:  Opcode              - Either AML_LOCAL_OP or AML_ARG_OP
- *              Index               - which local_var or argument to get
+ *              Index               - Which local_var or argument to get
  *              walk_state          - Current walk state object
  *              dest_desc           - Where Arg or Local value is returned
  *
@@ -459,7 +459,7 @@ acpi_ds_method_data_get_value(u16 opcode,
  * FUNCTION:    acpi_ds_method_data_delete_value
  *
  * PARAMETERS:  Opcode              - Either AML_LOCAL_OP or AML_ARG_OP
- *              Index               - which local_var or argument to delete
+ *              Index               - Which local_var or argument to delete
  *              walk_state          - Current walk state object
  *
  * RETURN:      None
diff --git a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c
index a8deb700cf33..35074399c617 100644
--- a/drivers/acpi/dispatcher/dswload.c
+++ b/drivers/acpi/dispatcher/dswload.c
@@ -178,12 +178,12 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
                          * Target of Scope() not found.  Generate an External for it, and
                          * insert the name into the namespace.
                          */
-                        acpi_dm_add_to_external_list(path);
+                        acpi_dm_add_to_external_list(path, ACPI_TYPE_DEVICE, 0);
                         status =
                             acpi_ns_lookup(walk_state->scope_info, path,
                                            object_type, ACPI_IMODE_LOAD_PASS1,
                                            ACPI_NS_SEARCH_PARENT, walk_state,
-                                           &(node));
+                                           &node);
                 }
 #endif
                 if (ACPI_FAILURE(status)) {
@@ -301,10 +301,41 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state,
                 status =
                     acpi_ns_lookup(walk_state->scope_info, path, object_type,
                                    ACPI_IMODE_LOAD_PASS1, flags, walk_state,
-                                   &(node));
+                                   &node);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_ERROR_NAMESPACE(path, status);
-                        return_ACPI_STATUS(status);
+                        if (status == AE_ALREADY_EXISTS) {
+
+                                /* The name already exists in this scope */
+
+                                if (node->flags & ANOBJ_IS_EXTERNAL) {
+                                        /*
+                                         * Allow one create on an object or segment that was
+                                         * previously declared External
+                                         */
+                                        node->flags &= ~ANOBJ_IS_EXTERNAL;
+                                        node->type = (u8) object_type;
+
+                                        /* Just retyped a node, probably will need to open a scope */
+
+                                        if (acpi_ns_opens_scope(object_type)) {
+                                                status =
+                                                    acpi_ds_scope_stack_push
+                                                    (node, object_type,
+                                                     walk_state);
+                                                if (ACPI_FAILURE(status)) {
+                                                        return_ACPI_STATUS
+                                                            (status);
+                                                }
+                                        }
+                                        status = AE_OK;
+                                }
+                        }
+
+                        if (ACPI_FAILURE(status)) {
+
+                                ACPI_ERROR_NAMESPACE(path, status);
+                                return_ACPI_STATUS(status);
+                        }
                 }
                 break;
         }
diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c
index 25fd12a29a29..aa179dc78011 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/events/evgpe.c
@@ -489,7 +489,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
  * RETURN:      None
  *
  * DESCRIPTION: Perform the actual execution of a GPE control method.  This
- *              function is called from an invocation of acpi_os_queue_for_execution
+ *              function is called from an invocation of acpi_os_exece
  *              (and therefore does NOT execute at interrupt level) so that
  *              the control method itself is not executed in the context of
  *              an interrupt handler.
@@ -674,9 +674,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                  * Execute the method associated with the GPE
                  * NOTE: Level-triggered GPEs are cleared after the method completes.
                  */
-                status = acpi_os_queue_for_execution(OSD_PRIORITY_GPE,
-                                                     acpi_ev_asynch_execute_gpe_method,
-                                                     gpe_event_info);
+                status = acpi_os_execute(OSL_GPE_HANDLER,
+                                         acpi_ev_asynch_execute_gpe_method,
+                                         gpe_event_info);
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
                                         "Unable to queue handler for GPE[%2X] - event disabled",
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c
index 97e05481aa7c..24e0b8d36f31 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/events/evmisc.c
@@ -191,9 +191,8 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
                 notify_info->notify.value = (u16) notify_value;
                 notify_info->notify.handler_obj = handler_obj;
 
-                status = acpi_os_queue_for_execution(OSD_PRIORITY_HIGH,
-                                                     acpi_ev_notify_dispatch,
-                                                     notify_info);
+                status = acpi_os_execute(OSL_NOTIFY_HANDLER,
+                                         acpi_ev_notify_dispatch, notify_info);
                 if (ACPI_FAILURE(status)) {
                         acpi_ut_delete_generic_state(notify_info);
                 }
@@ -346,9 +345,8 @@ static u32 acpi_ev_global_lock_handler(void *context)
 
                 /* Run the Global Lock thread which will signal all waiting threads */
 
-                status = acpi_os_queue_for_execution(OSD_PRIORITY_HIGH,
-                                                     acpi_ev_global_lock_thread,
-                                                     context);
+                status = acpi_os_execute(OSL_GLOBAL_LOCK_HANDLER,
+                                         acpi_ev_global_lock_thread, context);
                 if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
                                         "Could not queue Global Lock thread"));
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index eb29e96f053c..edf9d2e1dff9 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.c
@@ -261,7 +261,8 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
  *              Function            - Read or Write operation
  *              Address             - Where in the space to read or write
  *              bit_width           - Field width in bits (8, 16, 32, or 64)
- *              Value               - Pointer to in or out value
+ *              Value               - Pointer to in or out value, must be
+ *                                    full 64-bit acpi_integer
  *
  * RETURN:      Status
  *
@@ -274,7 +275,7 @@ acpi_status
 acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                                u32 function,
                                acpi_physical_address address,
-                               u32 bit_width, void *value)
+                               u32 bit_width, acpi_integer * value)
 {
         acpi_status status;
         acpi_status status2;
@@ -1007,7 +1008,7 @@ acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,
  *
  * PARAMETERS:  walk_namespace callback
  *
- * DESCRIPTION: Run _REg method for region objects of the requested space_iD
+ * DESCRIPTION: Run _REG method for region objects of the requested space_iD
  *
  ******************************************************************************/
 
diff --git a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c
index 9c46f3338640..9ae3cb55979b 100644
--- a/drivers/acpi/executer/exconfig.c
+++ b/drivers/acpi/executer/exconfig.c
@@ -298,6 +298,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
         struct acpi_table_header *table_ptr = NULL;
         acpi_physical_address address;
         struct acpi_table_header table_header;
+        acpi_integer temp;
         u32 i;
 
         ACPI_FUNCTION_TRACE(ex_load_op);
@@ -326,7 +327,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
 
                 address = obj_desc->region.address;
 
-                /* Get the table length from the table header */
+                /* Get part of the table header to get the table length */
 
                 table_header.length = 0;
                 for (i = 0; i < 8; i++) {
@@ -334,11 +335,14 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                             acpi_ev_address_space_dispatch(obj_desc, ACPI_READ,
                                                            (acpi_physical_address)
                                                            (i + address), 8,
-                                                           ((u8 *) &
-                                                            table_header) + i);
+                                                           &temp);
                         if (ACPI_FAILURE(status)) {
                                 return_ACPI_STATUS(status);
                         }
+
+                        /* Get the one valid byte of the returned 64-bit value */
+
+                        ACPI_CAST_PTR(u8, &table_header)[i] = (u8) temp;
                 }
 
                 /* Sanity check the table length */
@@ -361,11 +365,14 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                             acpi_ev_address_space_dispatch(obj_desc, ACPI_READ,
                                                            (acpi_physical_address)
                                                            (i + address), 8,
-                                                           ((u8 *) table_ptr +
-                                                            i));
+                                                           &temp);
                         if (ACPI_FAILURE(status)) {
                                 goto cleanup;
                         }
+
+                        /* Get the one valid byte of the returned 64-bit value */
+
+                        ACPI_CAST_PTR(u8, table_ptr)[i] = (u8) temp;
                 }
                 break;
 
diff --git a/drivers/acpi/executer/exstorob.c b/drivers/acpi/executer/exstorob.c
index 18925f5b313c..99ebe5adfcda 100644
--- a/drivers/acpi/executer/exstorob.c
+++ b/drivers/acpi/executer/exstorob.c
@@ -103,7 +103,7 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,
                  * NOTE: ACPI versions up to 3.0 specified that the buffer must be
                  * truncated if the string is smaller than the buffer.  However, "other"
                  * implementations of ACPI never did this and thus became the defacto
-                 * standard. ACPi 3.0_a changes this behavior such that the buffer
+                 * standard. ACPI 3.0_a changes this behavior such that the buffer
                  * is no longer truncated.
                  */
 
diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c
index 5e3f63a90fb4..ba8ad569188f 100644
--- a/drivers/acpi/namespace/nsaccess.c
+++ b/drivers/acpi/namespace/nsaccess.c
@@ -157,7 +157,7 @@ acpi_status acpi_ns_root_initialize(void)
 
 #if defined (ACPI_ASL_COMPILER)
 
-                                /* save the parameter count for the i_aSL compiler */
+                                /* Save the parameter count for the i_aSL compiler */
 
                                 new_node->value = obj_desc->method.param_count;
 #else
@@ -311,8 +311,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
         acpi_object_type type_to_check_for;
         acpi_object_type this_search_type;
         u32 search_parent_flag = ACPI_NS_SEARCH_PARENT;
-        u32 local_flags = flags & ~(ACPI_NS_ERROR_IF_FOUND |
-                                    ACPI_NS_SEARCH_PARENT);
+        u32 local_flags;
 
         ACPI_FUNCTION_TRACE(ns_lookup);
 
@@ -320,8 +319,9 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        acpi_gbl_ns_lookup_count++;
+        local_flags = flags & ~(ACPI_NS_ERROR_IF_FOUND | ACPI_NS_SEARCH_PARENT);
         *return_node = ACPI_ENTRY_NOT_FOUND;
+        acpi_gbl_ns_lookup_count++;
 
         if (!acpi_gbl_root_node) {
                 return_ACPI_STATUS(AE_NO_NAMESPACE);
diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c
index 34ac512a2d5e..d2473476afa5 100644
--- a/drivers/acpi/namespace/nssearch.c
+++ b/drivers/acpi/namespace/nssearch.c
@@ -299,7 +299,7 @@ acpi_ns_search_and_enter(u32 target_name,
 
         if (!node || !target_name || !return_node) {
                 ACPI_ERROR((AE_INFO,
-                            "Null param: Node %p Name %X ReturnNode %p",
+                            "Null parameter: Node %p Name %X ReturnNode %p",
                             node, target_name, return_node));
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
@@ -385,6 +385,11 @@ acpi_ns_search_and_enter(u32 target_name,
         if (!new_node) {
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
+#ifdef ACPI_ASL_COMPILER
+        if (flags & ACPI_NS_EXTERNAL) {
+                new_node->flags |= ANOBJ_IS_EXTERNAL;
+        }
+#endif
 
         /* Install the new object into the parent's list of children */
 
diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c
index a573ad5d41db..cf87b0230026 100644
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.c
@@ -451,7 +451,7 @@ acpi_rs_get_list_length(u8 * aml_buffer,
                  */
                 buffer_size = acpi_gbl_resource_struct_sizes[resource_index] +
                     extra_struct_bytes;
-                buffer_size = ACPI_ROUND_UP_TO_NATIVE_WORD(buffer_size);
+                buffer_size = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(buffer_size);
 
                 *size_needed += buffer_size;
 
@@ -579,7 +579,7 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
 
                 /* Round up the size since each element must be aligned */
 
-                temp_size_needed = ACPI_ROUND_UP_to_64_bIT(temp_size_needed);
+                temp_size_needed = ACPI_ROUND_UP_TO_64BIT(temp_size_needed);
 
                 /* Point to the next union acpi_operand_object */
 
diff --git a/drivers/acpi/resources/rscreate.c b/drivers/acpi/resources/rscreate.c
index 4c322daaf885..008058acdd39 100644
--- a/drivers/acpi/resources/rscreate.c
+++ b/drivers/acpi/resources/rscreate.c
@@ -335,7 +335,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                 /* Now align the current length */
 
                 user_prt->length =
-                    (u32) ACPI_ROUND_UP_to_64_bIT(user_prt->length);
+                    (u32) ACPI_ROUND_UP_TO_64BIT(user_prt->length);
 
                 /* 4) Fourth subobject: Dereference the PRT.source_index */
 
diff --git a/drivers/acpi/resources/rsutils.c b/drivers/acpi/resources/rsutils.c
index aa98eebc9b78..0e493f2fec4d 100644
--- a/drivers/acpi/resources/rsutils.c
+++ b/drivers/acpi/resources/rsutils.c
@@ -354,6 +354,7 @@ acpi_rs_get_resource_source(acpi_rs_length resource_length,
                  * Zero the entire area of the buffer.
                  */
                 total_length =
+                    (u32)
                     ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) +
                     1;
                 total_length = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(total_length);
@@ -528,7 +529,7 @@ acpi_rs_get_crs_method_data(acpi_handle handle, struct acpi_buffer *ret_buffer)
          */
         status = acpi_rs_create_resource_list(obj_desc, ret_buffer);
 
-        /* on exit, we must delete the object returned by evaluate_object */
+        /* On exit, we must delete the object returned by evaluate_object */
 
         acpi_ut_remove_reference(obj_desc);
         return_ACPI_STATUS(status);
@@ -578,7 +579,7 @@ acpi_rs_get_prs_method_data(acpi_handle handle, struct acpi_buffer *ret_buffer)
          */
         status = acpi_rs_create_resource_list(obj_desc, ret_buffer);
 
-        /* on exit, we must delete the object returned by evaluate_object */
+        /* On exit, we must delete the object returned by evaluate_object */
 
         acpi_ut_remove_reference(obj_desc);
         return_ACPI_STATUS(status);
diff --git a/drivers/acpi/tables/tbrsdt.c b/drivers/acpi/tables/tbrsdt.c
index 9e226438a3f6..494965229fa2 100644
--- a/drivers/acpi/tables/tbrsdt.c
+++ b/drivers/acpi/tables/tbrsdt.c
@@ -196,10 +196,8 @@ acpi_status acpi_tb_validate_rsdt(struct acpi_table_header *table_ptr)
                 ACPI_DUMP_BUFFER(acpi_gbl_RSDP, 20);
 
                 ACPI_ERROR((AE_INFO,
-                            "RSDT/XSDT signature at %X (%p) is invalid",
-                            acpi_gbl_RSDP->rsdt_physical_address,
-                            (void *)(acpi_native_uint) acpi_gbl_RSDP->
-                            rsdt_physical_address));
+                            "RSDT/XSDT signature at %X is invalid",
+                            acpi_gbl_RSDP->rsdt_physical_address));
 
                 if (acpi_gbl_root_table_type == ACPI_TABLE_TYPE_RSDT) {
                         ACPI_ERROR((AE_INFO, "Looking for RSDT"));
diff --git a/drivers/acpi/tables/tbxfroot.c b/drivers/acpi/tables/tbxfroot.c
index 3107e741d510..da2648bbdbc0 100644
--- a/drivers/acpi/tables/tbxfroot.c
+++ b/drivers/acpi/tables/tbxfroot.c
@@ -472,10 +472,10 @@ static u8 *acpi_tb_scan_memory_for_rsdp(u8 * start_address, u32 length)
  *
  * RETURN:      Status, RSDP physical address
  *
- * DESCRIPTION: search lower 1_mbyte of memory for the root system descriptor
+ * DESCRIPTION: Search lower 1_mbyte of memory for the root system descriptor
  *              pointer structure.  If it is found, set *RSDP to point to it.
  *
- *              NOTE1: The RSDp must be either in the first 1_k of the Extended
+ *              NOTE1: The RSDP must be either in the first 1_k of the Extended
  *              BIOS Data Area or between E0000 and FFFFF (From ACPI Spec.)
  *              Only a 32-bit physical address is necessary.
  *
@@ -525,7 +525,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
 
                 if (physical_address > 0x400) {
                         /*
-                         * 1b) Search EBDA paragraphs (EBDa is required to be a
+                         * 1b) Search EBDA paragraphs (EBDA is required to be a
                          *     minimum of 1_k length)
                          */
                         status = acpi_os_map_memory((acpi_physical_address)
@@ -550,7 +550,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
                                 /* Return the physical address */
 
                                 physical_address +=
-                                    ACPI_PTR_DIFF(mem_rover, table_ptr);
+                                    (u32) ACPI_PTR_DIFF(mem_rover, table_ptr);
 
                                 table_info->physical_address =
                                     (acpi_physical_address) physical_address;
@@ -584,9 +584,9 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
 
                         /* Return the physical address */
 
-                        physical_address =
-                            ACPI_HI_RSDP_WINDOW_BASE + ACPI_PTR_DIFF(mem_rover,
-                                                                     table_ptr);
+                        physical_address = (u32)
+                            (ACPI_HI_RSDP_WINDOW_BASE +
+                             ACPI_PTR_DIFF(mem_rover, table_ptr));
 
                         table_info->physical_address =
                             (acpi_physical_address) physical_address;
@@ -607,7 +607,7 @@ acpi_tb_find_rsdp(struct acpi_table_desc *table_info, u32 flags)
 
                 if (physical_address > 0x400) {
                         /*
-                         * 1b) Search EBDA paragraphs (EBDa is required to be a minimum of
+                         * 1b) Search EBDA paragraphs (EBDA is required to be a minimum of
                          *     1_k length)
                          */
                         mem_rover =
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c
index e666c71be0bf..9450f9b5bfb2 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.c
@@ -443,7 +443,6 @@ struct acpi_fixed_event_info acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS] =
 /* Region type decoding */
 
 const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {
-/*! [Begin] no source code translation (keep these ASL Keywords as-is) */
         "SystemMemory",
         "SystemIO",
         "PCI_Config",
@@ -452,7 +451,6 @@ const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {
         "CMOS",
         "PCIBARTarget",
         "DataTable"
-/*! [End] no source code translation !*/
 };
 
 char *acpi_ut_get_region_name(u8 space_id)
@@ -482,13 +480,11 @@ char *acpi_ut_get_region_name(u8 space_id)
 /* Event type decoding */
 
 static const char *acpi_gbl_event_types[ACPI_NUM_FIXED_EVENTS] = {
-/*! [Begin] no source code translation (keep these strings as-is) */
         "PM_Timer",
         "GlobalLock",
         "PowerButton",
         "SleepButton",
         "RealTimeClock",
-/*! [End] no source code translation !*/
 };
 
 char *acpi_ut_get_event_name(u32 event_id)
@@ -526,7 +522,6 @@ static const char acpi_gbl_bad_type[] = "UNDEFINED";
 /* Printable names of the ACPI object types */
 
 static const char *acpi_gbl_ns_type_names[] = {
-/*! [Begin] no source code translation (keep these strings as-is) */
         /* 00 */ "Untyped",
         /* 01 */ "Integer",
         /* 02 */ "String",
@@ -558,7 +553,6 @@ static const char *acpi_gbl_ns_type_names[] = {
         /* 28 */ "Extra",
         /* 29 */ "Data",
         /* 30 */ "Invalid"
-/*! [End] no source code translation !*/
 };
 
 char *acpi_ut_get_type_name(acpi_object_type type)
@@ -641,7 +635,6 @@ char *acpi_ut_get_node_name(void *object)
 /* Printable names of object descriptor types */
 
 static const char *acpi_gbl_desc_type_names[] = {
-/*! [Begin] no source code translation (keep these ASL Keywords as-is) */
         /* 00 */ "Invalid",
         /* 01 */ "Cached",
         /* 02 */ "State-Generic",
@@ -658,7 +651,6 @@ static const char *acpi_gbl_desc_type_names[] = {
         /* 13 */ "Parser",
         /* 14 */ "Operand",
         /* 15 */ "Node"
-/*! [End] no source code translation !*/
 };
 
 char *acpi_ut_get_descriptor_name(void *object)