ACPICA: Module-level code: enable _REG execution in same scope

This change enables the execution of _REG methods that appear
in the same scope as the module-level code, in resonse to an
operation region declaration within the module-level code.

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 15 insertions, 0 deletions

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;