diff options
author | jkim <jkim@FreeBSD.org> | 2009-12-14 22:24:04 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2009-12-14 22:24:04 +0000 |
commit | ef51d3ef199b7961f1e241610a377dda0c59f630 (patch) | |
tree | 62734f1598c32d948ac5e2df44f22ba3bd819638 /sys/contrib/dev/acpica/events/evrgnini.c | |
parent | b326f2699c099ff360442f8ad4751d4d443c1ef6 (diff) | |
download | FreeBSD-src-ef51d3ef199b7961f1e241610a377dda0c59f630.zip FreeBSD-src-ef51d3ef199b7961f1e241610a377dda0c59f630.tar.gz |
Merge ACPICA 20091214.
Diffstat (limited to 'sys/contrib/dev/acpica/events/evrgnini.c')
-rw-r--r-- | sys/contrib/dev/acpica/events/evrgnini.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sys/contrib/dev/acpica/events/evrgnini.c b/sys/contrib/dev/acpica/events/evrgnini.c index adc9d7a..4718b20 100644 --- a/sys/contrib/dev/acpica/events/evrgnini.c +++ b/sys/contrib/dev/acpica/events/evrgnini.c @@ -716,6 +716,20 @@ AcpiEvInitializeRegion ( HandlerObj = ObjDesc->ThermalZone.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 AcpiNsExecModuleCode + */ + if (ObjDesc->Method.Flags & AOPOBJ_MODULE_LEVEL) + { + HandlerObj = ObjDesc->Method.Extra.Handler; + } + break; + default: /* Ignore other objects */ break; |