6 files changed, 36 insertions, 4 deletions

diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index b39d682a2140..64062b1be3ee 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h
@@ -180,7 +180,11 @@ struct acpi_object_method {
         u8 sync_level;
         union acpi_operand_object *mutex;
         u8 *aml_start;
-        ACPI_INTERNAL_METHOD implementation;
+        union {
+                ACPI_INTERNAL_METHOD implementation;
+                union acpi_operand_object *handler;
+        } extra;
+
         u32 aml_length;
         u8 thread_count;
         acpi_owner_id owner_id;
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index 567a4899a018..e786f9fd767f 100644
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -414,7 +414,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
         /* Invoke an internal method if necessary */
 
         if (obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY) {
-                status = obj_desc->method.implementation(next_walk_state);
+                status = obj_desc->method.extra.implementation(next_walk_state);
                 if (status == AE_OK) {
                         status = AE_CTRL_TERMINATE;
                 }
diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index cf29c4953028..ff168052a332 100644
--- a/drivers/acpi/acpica/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -575,6 +575,21 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,
                                 handler_obj = obj_desc->thermal_zone.handler;
                                 break;
 
+                        case ACPI_TYPE_METHOD:
+                                /*
+                                 * If we are executing module level code, the original
+                                 * Node's object was replaced by this Method object and we
+                                 * saved the handler in the method object.
+                                 *
+                                 * See acpi_ns_exec_module_code
+                                 */
+                                if (obj_desc->method.
+                                    flags & AOPOBJ_MODULE_LEVEL) {
+                                        handler_obj =
+                                            obj_desc->method.extra.handler;
+                                }
+                                break;
+
                         default:
                                 /* Ignore other objects */
                                 break;
diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index 9c3cdbe2d82a..d622ba770000 100644
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -165,7 +165,7 @@ acpi_status acpi_ns_root_initialize(void)
 
                                 obj_desc->method.method_flags =
                                     AML_METHOD_INTERNAL_ONLY;
-                                obj_desc->method.implementation =
+                                obj_desc->method.extra.implementation =
                                     acpi_ut_osi_implementation;
 #endif
                                 break;
diff --git a/drivers/acpi/acpica/nseval.c b/drivers/acpi/acpica/nseval.c
index 65e0d1a260ea..af9fe9103734 100644
--- a/drivers/acpi/acpica/nseval.c
+++ b/drivers/acpi/acpica/nseval.c
@@ -381,6 +381,18 @@ acpi_ns_exec_module_code(union acpi_operand_object *method_obj,
                                     method_obj->method.next_object);
         type = acpi_ns_get_type(parent_node);
 
+        /*
+         * Get the region handler and save it in the method object. We may need
+         * this if an operation region declaration causes a _REG method to be run.
+         *
+         * We can't do this in acpi_ps_link_module_code because
+         * acpi_gbl_root_node->Object is NULL at PASS1.
+         */
+        if ((type == ACPI_TYPE_DEVICE) && parent_node->object) {
+                method_obj->method.extra.handler =
+                    parent_node->object->device.handler;
+        }
+
         /* Must clear next_object (acpi_ns_attach_object needs the field) */
 
         method_obj->method.next_object = NULL;
diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c
index 12934ad6da8e..d0c1b91eb8ca 100644
--- a/drivers/acpi/acpica/psxface.c
+++ b/drivers/acpi/acpica/psxface.c
@@ -287,7 +287,8 @@ acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
         /* Invoke an internal method if necessary */
 
         if (info->obj_desc->method.method_flags & AML_METHOD_INTERNAL_ONLY) {
-                status = info->obj_desc->method.implementation(walk_state);
+                status =
+                    info->obj_desc->method.extra.implementation(walk_state);
                 info->return_object = walk_state->return_desc;
 
                 /* Cleanup states */