diff options
| -rw-r--r-- | drivers/acpi/acpica/evrgnini.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/acpica/nsload.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/acpica/nsparse.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/acpica/tbdata.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/acpica/tbxfload.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/acpica/utxfinit.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/bus.c | 6 | ||||
| -rw-r--r-- | include/acpi/acpixf.h | 7 |
8 files changed, 12 insertions, 13 deletions
diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c index 4187f563fede..ade127f26b48 100644 --- a/drivers/acpi/acpica/evrgnini.c +++ b/drivers/acpi/acpica/evrgnini.c @@ -562,7 +562,7 @@ acpi_status acpi_ev_initialize_region(union acpi_operand_object *region_obj) * * See acpi_ns_exec_module_code */ - if (!acpi_gbl_parse_table_as_term_list && + if (!acpi_gbl_execute_tables_as_methods && obj_desc->method. info_flags & ACPI_METHOD_MODULE_LEVEL) { handler_obj = diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c index fdfe9309bd33..d3440af82e54 100644 --- a/drivers/acpi/acpica/nsload.c +++ b/drivers/acpi/acpica/nsload.c @@ -157,7 +157,7 @@ unlock: * other ACPI implementations. Optionally, the execution can be deferred * until later, see acpi_initialize_objects. */ - if (!acpi_gbl_parse_table_as_term_list + if (!acpi_gbl_execute_tables_as_methods && !acpi_gbl_group_module_level_code) { acpi_ns_exec_module_code_list(); } diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c index acb1aede720e..0036cec4e982 100644 --- a/drivers/acpi/acpica/nsparse.c +++ b/drivers/acpi/acpica/nsparse.c @@ -266,7 +266,7 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node) ACPI_FUNCTION_TRACE(ns_parse_table); - if (acpi_gbl_parse_table_as_term_list) { + if (acpi_gbl_execute_tables_as_methods) { ACPI_DEBUG_PRINT_RAW((ACPI_DB_PARSE, "%s: **** Start table execution pass\n", ACPI_GET_FUNCTION_NAME)); diff --git a/drivers/acpi/acpica/tbdata.c b/drivers/acpi/acpica/tbdata.c index ec69267f1447..5b59d419ebb7 100644 --- a/drivers/acpi/acpica/tbdata.c +++ b/drivers/acpi/acpica/tbdata.c @@ -968,7 +968,7 @@ acpi_tb_load_table(u32 table_index, struct acpi_namespace_node *parent_node) /* Execute any module-level code that was found in the table */ - if (!acpi_gbl_parse_table_as_term_list + if (!acpi_gbl_execute_tables_as_methods && acpi_gbl_group_module_level_code) { acpi_ns_exec_module_code_list(); } diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c index e09b4b26300e..e49999e8542b 100644 --- a/drivers/acpi/acpica/tbxfload.c +++ b/drivers/acpi/acpica/tbxfload.c @@ -103,7 +103,7 @@ acpi_status ACPI_INIT_FUNCTION acpi_load_tables(void) "While loading namespace from ACPI tables")); } - if (acpi_gbl_parse_table_as_term_list + if (acpi_gbl_execute_tables_as_methods || !acpi_gbl_group_module_level_code) { /* * Initialize the objects that remain uninitialized. This diff --git a/drivers/acpi/acpica/utxfinit.c b/drivers/acpi/acpica/utxfinit.c index e727db52a55e..0e62a915a3a7 100644 --- a/drivers/acpi/acpica/utxfinit.c +++ b/drivers/acpi/acpica/utxfinit.c @@ -265,7 +265,7 @@ acpi_status ACPI_INIT_FUNCTION acpi_initialize_objects(u32 flags) * all of the tables have been loaded. It is a legacy option and is * not compatible with other ACPI implementations. See acpi_ns_load_table. */ - if (!acpi_gbl_parse_table_as_term_list + if (!acpi_gbl_execute_tables_as_methods && acpi_gbl_group_module_level_code) { acpi_ns_exec_module_code_list(); diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 0dad0bd9327b..84b4a62018eb 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -68,7 +68,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id) #endif static int set_gbl_term_list(const struct dmi_system_id *id) { - acpi_gbl_parse_table_as_term_list = 1; + acpi_gbl_execute_tables_as_methods = 1; return 0; } @@ -1077,7 +1077,7 @@ void __init acpi_early_init(void) goto error0; } - if (!acpi_gbl_parse_table_as_term_list && + if (!acpi_gbl_execute_tables_as_methods && acpi_gbl_group_module_level_code) { status = acpi_load_tables(); if (ACPI_FAILURE(status)) { @@ -1167,7 +1167,7 @@ static int __init acpi_bus_init(void) status = acpi_ec_ecdt_probe(); /* Ignore result. Not having an ECDT is not fatal. */ - if (acpi_gbl_parse_table_as_term_list || + if (acpi_gbl_execute_tables_as_methods || !acpi_gbl_group_module_level_code) { status = acpi_load_tables(); if (ACPI_FAILURE(status)) { diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index b8d42c5c4264..2b53a575a83e 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -198,13 +198,12 @@ ACPI_INIT_GLOBAL(u8, acpi_gbl_do_not_use_xsdt, FALSE); ACPI_INIT_GLOBAL(u8, acpi_gbl_group_module_level_code, FALSE); /* - * Optionally support module level code by parsing the entire table as - * a term_list. Default is FALSE, do not execute entire table until some - * lock order issues are fixed. + * Optionally support module level code by parsing an entire table as + * a method as it is loaded. Default is TRUE. * NOTE, this is essentially obsolete and will be removed soon * (01/2018). */ -ACPI_INIT_GLOBAL(u8, acpi_gbl_parse_table_as_term_list, TRUE); +ACPI_INIT_GLOBAL(u8, acpi_gbl_execute_tables_as_methods, TRUE); /* * Optionally use 32-bit FADT addresses if and when there is a conflict |