diff options
| author | Rafael J. Wysocki | 2019-07-08 11:04:00 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2019-07-08 11:04:00 +0200 |
| commit | 62fd33d3f519ef84e17fde4d7b4f1e3b62e7156d (patch) | |
| tree | 7e6a425df6d7b393f397fe4fd87d459327b56692 /drivers/acpi/acpica/exconfig.c | |
| parent | Merge branches 'acpi-tables', 'acpi-osl', 'acpi-misc' and 'acpi-tools' (diff) | |
| parent | ACPICA: Update version to 20190703 (diff) | |
| download | kernel-qcow2-linux-62fd33d3f519ef84e17fde4d7b4f1e3b62e7156d.tar.gz kernel-qcow2-linux-62fd33d3f519ef84e17fde4d7b4f1e3b62e7156d.tar.xz kernel-qcow2-linux-62fd33d3f519ef84e17fde4d7b4f1e3b62e7156d.zip | |
Merge branch 'acpica'
* acpica:
ACPICA: Update version to 20190703
ACPICA: Update table load object initialization
ACPICA: Update for object initialization sequence
ACPICA: remove legacy module-level code due to deprecation
ACPICA: Namespace: simplify creation of the initial/default namespace
ACPICA: Clear status of GPEs on first direct enable
Diffstat (limited to 'drivers/acpi/acpica/exconfig.c')
| -rw-r--r-- | drivers/acpi/acpica/exconfig.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c index 587aeeeb5070..58c04d706723 100644 --- a/drivers/acpi/acpica/exconfig.c +++ b/drivers/acpi/acpica/exconfig.c @@ -174,12 +174,9 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state, return_ACPI_STATUS(status); } - /* Complete the initialization/resolution of package objects */ + /* Complete the initialization/resolution of new objects */ - status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE, ACPI_ROOT_OBJECT, - ACPI_UINT32_MAX, 0, - acpi_ns_init_one_package, NULL, NULL, - NULL); + acpi_ns_initialize_objects(); /* Parameter Data (optional) */ @@ -437,12 +434,11 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc, return_ACPI_STATUS(status); } - /* Complete the initialization/resolution of package objects */ + /* Complete the initialization/resolution of new objects */ - status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE, ACPI_ROOT_OBJECT, - ACPI_UINT32_MAX, 0, - acpi_ns_init_one_package, NULL, NULL, - NULL); + acpi_ex_exit_interpreter(); + acpi_ns_initialize_objects(); + acpi_ex_enter_interpreter(); /* Store the ddb_handle into the Target operand */ |