|
@@ -300,10 +300,25 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
|
|
|
* we must enter this object into the namespace. The created
|
|
|
* object is temporary and will be deleted upon completion of
|
|
|
* the execution of this method.
|
|
|
+ *
|
|
|
+ * Note 10/2010: Except for the Scope() op. This opcode does
|
|
|
+ * not actually create a new object, it refers to an existing
|
|
|
+ * object. However, for Scope(), we want to indeed open a
|
|
|
+ * new scope.
|
|
|
*/
|
|
|
- status = acpi_ds_load2_begin_op(walk_state, NULL);
|
|
|
+ if (op->common.aml_opcode != AML_SCOPE_OP) {
|
|
|
+ status =
|
|
|
+ acpi_ds_load2_begin_op(walk_state, NULL);
|
|
|
+ } else {
|
|
|
+ status =
|
|
|
+ acpi_ds_scope_stack_push(op->named.node,
|
|
|
+ op->named.node->
|
|
|
+ type, walk_state);
|
|
|
+ if (ACPI_FAILURE(status)) {
|
|
|
+ return_ACPI_STATUS(status);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
break;
|
|
|
|
|
|
case AML_CLASS_EXECUTE:
|