Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28f538b5 authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Enable Scope change to root during module-level code execution. 



Allows constructs like this:
    If (XXXX)
        Scope (\)
        ...

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarFeng Tang <feng.tang@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent a950c135

drivers/acpi/acpica/dswload.c

+14 −0
Original line number Diff line number Diff line
@@ -230,6 +230,20 @@ acpi_ds_load1_begin_op(struct acpi_walk_state * walk_state, 
			walk_state->scope_info->common.value = ACPI_TYPE_ANY;

			break;



		case ACPI_TYPE_METHOD:



			/*

			 * Allow scope change to root during execution of module-level

			 * code. Root is typed METHOD during this time.

			 */

			if ((node == acpi_gbl_root_node) &&

			    (walk_state->

			     parse_flags & ACPI_PARSE_MODULE_LEVEL)) {

				break;

			}



			/*lint -fallthrough */



		default:



			/* All other types are an error */

drivers/acpi/acpica/dswload2.c

+14 −0
Original line number Diff line number Diff line
@@ -230,6 +230,20 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state, 
			walk_state->scope_info->common.value = ACPI_TYPE_ANY;

			break;



		case ACPI_TYPE_METHOD:



			/*

			 * Allow scope change to root during execution of module-level

			 * code. Root is typed METHOD during this time.

			 */

			if ((node == acpi_gbl_root_node) &&

			    (walk_state->

			     parse_flags & ACPI_PARSE_MODULE_LEVEL)) {

				break;

			}



			/*lint -fallthrough */



		default:



			/* All other types are an error */